badmfck-api-server 3.2.5 → 3.2.7

package/dist/apiServer/APIService.js

@@ -95,7 +95,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "3.2.5";
+    version = "3.2.7";
     options;
     monitor = null;
     monitorIndexFile;

package/dist/apiServer/LogService.js

@@ -181,6 +181,9 @@ class LogService extends BaseService_1.BaseService {
                 const lastLogItem = this.log[this.log.length - 1];
                 if (lastLogItem && lastLogItem.text === logitem.text && lastLogItem.source === logitem.source && lastLogItem.level === logitem.level) {
                     lastLogItem.repeat++;
+                    lastLogItem.time = logitem.time;
+                    lastLogItem.date = logitem.date;
+                    LogService.nextID--;
                     exports.S_LOG_CREATED.invoke(lastLogItem);
                     return;
                 }

package/dist/apiServer/MonitorService.d.ts

@@ -1,14 +1,9 @@
 import Signal, { Req } from "badmfck-signal";
 import { BaseService } from "./BaseService";
 import { TransferPacketVO } from "./structures/Interfaces";
-export interface IEPStat {
-    success: number;
-    fail: number;
-}
 export interface ICustomEvent {
     event: string;
     data?: any;
-    project?: string;
 }
 export interface IEPStatReqFilter {
     range?: "minute" | "hour" | "day";
@@ -18,20 +13,47 @@ export interface IEPStatReqFilter {
     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 const REQ_EP_STAT: Req<void, Record<string, IMonitorDaySlot[]>>;
+export declare const REQ_MONITOR_CPU_STAT: Req<void, any>;
+type IMonitorMinutesSlot = {
+    count: number;
+    yyyymmddhhmm: number;
+};
+type IMonitorHoursSlot = {
+    count: number;
+    yyyymmddhh: number;
+    minutes: IMonitorMinutesSlot[];
+};
+type IMonitorDaySlot = {
+    ep: string;
+    yyyymmdd: number;
+    count: number;
+    hours: IMonitorHoursSlot[];
+};
 export declare class MonitorService extends BaseService {
-    projects: Map<string, Map<number, Map<string, IEPStat>>>;
+    private prevCpu;
+    private prevHrTime;
+    readonly intervalMs = 10000;
+    readonly maxSlots: number;
+    private history;
+    stat: Map<string, IMonitorDaySlot[]>;
     constructor();
     init(): Promise<void>;
-    getEPStat(req: IEPStatReqFilter): Promise<IEPStatResult>;
+    getEPStat(): Promise<Record<string, IMonitorDaySlot[]>>;
     onStatRegistrate(data: TransferPacketVO): void;
-    pad(num: number): string;
-    getMinutes(date: Date): number;
-    getDate(minutes: number): Date;
-    getMinutesInMonth(date: Date): number;
+    private collectUsage;
+    getUsage(): {
+        timestamp: number;
+        cpu: number;
+        memory: {
+            rss: number;
+            heapUsed: number;
+            heapTotal: number;
+            external: number;
+        };
+    }[];
 }
+export {};

package/dist/apiServer/MonitorService.js

@@ -23,127 +23,102 @@ 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_CUSTOM_EVENT = exports.S_STAT_REGISTRATE_REQUEST = void 0;
+exports.MonitorService = exports.REQ_MONITOR_CPU_STAT = 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");
+const YYYYMMDDHH_1 = require("./helper/YYYYMMDDHH");
 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");
+exports.REQ_MONITOR_CPU_STAT = new badmfck_signal_1.Req(undefined, "REQ_MONITOR_CPU_STAT");
 class MonitorService extends BaseService_1.BaseService {
-    projects = new Map();
+    prevCpu = process.cpuUsage();
+    prevHrTime = process.hrtime();
+    intervalMs = 10_000;
+    maxSlots = (5 * 60 * 1000) / this.intervalMs;
+    history = [];
+    stat = new Map();
     constructor() {
         super("MonitorService");
-        exports.S_STAT_REGISTRATE_REQUEST.subscribe(req => this.onStatRegistrate(req));
-        exports.REQ_EP_STAT.listener = async (req) => this.getEPStat(req);
+        exports.S_STAT_REGISTRATE_REQUEST.subscribe((req) => this.onStatRegistrate(req));
+        exports.REQ_EP_STAT.listener = async (req) => this.getEPStat();
+        exports.REQ_MONITOR_CPU_STAT.listener = async () => this.getUsage();
+        setInterval(() => this.collectUsage(), this.intervalMs);
     }
     async init() {
         super.init();
     }
-    async getEPStat(req) {
-        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());
-                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 dateSlot = p.dates.find(p => p.date === range);
-                if (!dateSlot) {
-                    dateSlot = {
-                        date: range,
-                        endpoints: []
-                    };
-                    p.dates.push(dateSlot);
-                }
-                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;
-                }
-            }
-        }
-        return { filter: req, result: result };
+    async getEPStat() {
+        const result = {};
+        for (const [ep, slots] of this.stat.entries())
+            result[ep] = slots;
+        return result;
     }
     onStatRegistrate(data) {
-        const minute = this.getMinutes(new Date());
-        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();
-            projectSlot.set(minute, minuteSlot);
-        }
-        if (!data.endpoint)
-            data.endpoint = "unknown";
-        let epSlot = minuteSlot.get(data.endpoint);
+        const date = new Date();
+        const yyyymmdd = parseInt((0, YYYYMMDDHH_1.YYYYMMDDHH)(date, "yyyymmdd"));
+        const yyyymmddhh = parseInt((0, YYYYMMDDHH_1.YYYYMMDDHH)(date, "yyyymmddhh"));
+        const yyyymmddhhmm = parseInt((0, YYYYMMDDHH_1.YYYYMMDDHH)(date, "yyyymmddhhmm"));
+        const ep = data.endpoint || "unknown";
+        let epSlot = this.stat.get(ep);
         if (!epSlot) {
-            epSlot = { success: 0, fail: 0 };
-            minuteSlot.set(data.endpoint, epSlot);
+            epSlot = [];
+            this.stat.set(ep, epSlot);
         }
-        if (data.error) {
-            epSlot.fail++;
+        let slot = epSlot.find((s) => s.yyyymmdd === yyyymmdd && s.ep === ep);
+        if (!slot) {
+            slot = { ep, yyyymmdd: yyyymmdd, count: 0, hours: [] };
+            epSlot.push(slot);
         }
-        else {
-            epSlot.success++;
+        slot.count++;
+        let slotHour = slot.hours.find((h) => h.yyyymmddhh === yyyymmddhh);
+        if (!slotHour) {
+            slotHour = {
+                count: 0,
+                yyyymmddhh,
+                minutes: [],
+            };
+            slot.hours.push(slotHour);
         }
-        if (projectSlot.size > 3000) {
-            const firstItem = projectSlot.keys().next().value;
-            if (firstItem)
-                projectSlot.delete(firstItem);
+        slotHour.count++;
+        let slotMinute = slotHour.minutes.find((m) => m.yyyymmddhhmm === yyyymmddhhmm);
+        if (!slotMinute) {
+            slotMinute = {
+                count: 0,
+                yyyymmddhhmm,
+            };
+            slotHour.minutes.push(slotMinute);
         }
+        slotMinute.count++;
+        if (epSlot.length > 7)
+            epSlot.unshift();
     }
-    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);
+    collectUsage() {
+        const currentCpu = process.cpuUsage(this.prevCpu);
+        const currentHrTime = process.hrtime(this.prevHrTime);
+        this.prevCpu = process.cpuUsage();
+        this.prevHrTime = process.hrtime();
+        const elapsedMicros = currentHrTime[0] * 1e6 + currentHrTime[1] / 1e3;
+        const totalCpu = currentCpu.user + currentCpu.system;
+        const cpuPercent = (totalCpu / elapsedMicros) * 100;
+        const mem = process.memoryUsage();
+        this.history.push({
+            timestamp: Date.now(),
+            cpu: cpuPercent,
+            memory: {
+                rss: mem.rss,
+                heapUsed: mem.heapUsed,
+                heapTotal: mem.heapTotal,
+                external: mem.external,
+            },
+        });
+        if (this.history.length > this.maxSlots) {
+            this.history.shift();
+        }
     }
-    getMinutesInMonth(date) {
-        const daysInMonth = date.getDate();
-        return daysInMonth * 1440;
+    getUsage() {
+        return this.history;
     }
 }
 exports.MonitorService = MonitorService;

package/dist/apiServer/helper/Validator.js

@@ -120,8 +120,8 @@ class Validator {
                         errors.push("wrong value for field '" + i + "', expected " + expected.join(", ") + " got: " + value);
                 }
             }
-            if (typeof structure[i] === "string" && structure[i].includes("regex:")) {
-                const regex = structure[i].substring(6);
+            if (typeof structure[i] === "string" && structure["$__regex_" + i]) {
+                const regex = structure["$__regex_" + i];
                 const reg = new RegExp(regex);
                 if (reg.test(object[i]) === false)
                     errors.push("wrong value for field '" + i + "', false mask for: " + object[i]);
@@ -154,6 +154,16 @@ class Validator {
                     }
                 }
             }
+            if (typeof structure[i] === "number" && structure["$__min_" + i]) {
+                const min = structure["$__min_" + i];
+                if (object[i] < min)
+                    errors.push("value for field '" + i + "' is too small, expected more than " + min + " got: " + object[i]);
+            }
+            if (typeof structure[i] === "number" && structure["$__max_" + i]) {
+                const max = structure["$__max_" + i];
+                if (object[i] > max)
+                    errors.push("value for field '" + i + "' is too big, expected less than " + max + " got: " + object[i]);
+            }
             foundKeys.push(i);
         }
         if (errors.length > 0)

package/dist/apiServer/helper/YYYYMMDDHH.d.ts

@@ -0,0 +1,2 @@
+export declare function YYYYMMDDHH(date: Date, format?: "yyyymmddhhmm" | "yyyymmddhh" | "yyyymmdd" | "yyyymm"): string;
+export declare function YYYYMMDDHH_toDate(yyyymmddhh: number): Date;

package/dist/apiServer/helper/YYYYMMDDHH.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.YYYYMMDDHH_toDate = exports.YYYYMMDDHH = void 0;
+function YYYYMMDDHH(date, format = "yyyymmddhh") {
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, "0");
+    const day = String(date.getDate()).padStart(2, "0");
+    const hours = String(date.getHours()).padStart(2, "0");
+    const minutes = String(date.getMinutes()).padStart(2, "0");
+    switch (format) {
+        case "yyyymmddhh":
+            return `${year}${month}${day}${hours}`;
+        case "yyyymmdd":
+            return `${year}${month}${day}`;
+        case "yyyymm":
+            return `${year}${month}`;
+        case "yyyymmddhhmm":
+            return `${year}${month}${day}${hours}${minutes}`;
+        default:
+            return `${year}${month}${day}${hours}`;
+    }
+}
+exports.YYYYMMDDHH = YYYYMMDDHH;
+function YYYYMMDDHH_toDate(yyyymmddhh) {
+    const str = String(yyyymmddhh);
+    const year = parseInt(str.slice(0, 4), 10);
+    const month = parseInt(str.slice(4, 6), 10) - 1;
+    const day = parseInt(str.slice(6, 8), 10);
+    const hours = parseInt(str.slice(8, 10), 10);
+    return new Date(year, month, day, hours);
+}
+exports.YYYYMMDDHH_toDate = YYYYMMDDHH_toDate;

package/dist/apiServer/monitor/Monitor.js

@@ -9,7 +9,6 @@ const APIService_1 = require("../APIService");
 const BaseEndpoint_1 = require("../BaseEndpoint");
 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");
 const fs_1 = __importDefault(require("fs"));
@@ -163,12 +162,7 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
     }
     async serverStat(req) {
         await this.checkAuthentication(req);
-        let stat = {
-            cpuUsage: os_1.default.cpus(),
-            memoryTotal: os_1.default.totalmem(),
-            memoryUsage: os_1.default.freemem()
-        };
-        return { data: stat };
+        return { data: MonitorService_1.REQ_MONITOR_CPU_STAT.request() };
     }
     async checkAuthentication(req) {
         const users = await APIService_1.REQ_MONITOR_USERS.request();

package/package.json

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