badmfck-api-server 1.5.7 → 1.5.9

package/dist/apiServer/LogService.js

@@ -36,7 +36,7 @@ var LOG_LEVEL;
 })(LOG_LEVEL || (exports.LOG_LEVEL = LOG_LEVEL = {}));
 const getDefaultLogOptions = () => {
     return {
-        stackSize: 1000,
+        stackSize: 100,
         textLimit: 1024,
         level: LOG_LEVEL.ALL
     };
@@ -157,9 +157,9 @@ class LogService extends BaseService_1.BaseService {
                 this.options.output(logitem.source + " > " + logitem.level + " > " + logitem.date + " > " + text);
             exports.S_LOG_CREATED.invoke(logitem);
             this.log.push(logitem);
-            let limit = this.options.stackSize ?? 1000;
-            if (limit > 10000)
-                limit = 10000;
+            let limit = this.options.stackSize ?? 100;
+            if (limit > 1000)
+                limit = 1000;
             if (this.log.length > limit)
                 this.log.shift();
         });

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

@@ -6,17 +6,25 @@ interface IStatObject {
     fatalErrors: Map<string, number>;
     apiErrors: Map<string, number>;
 }
+interface ISystemStat {
+    cpuUsage: any;
+    memoryTotal: number;
+    memoryUsage: any;
+}
 export declare class Monitor extends BaseEndpoint {
     ignoreHttpLogging: boolean;
     private startedAt;
     private httpRequests;
+    private systemStat;
     constructor();
+    addSystemStat(): void;
     registrateError(endpoint: string): void;
     registrateFatalError(endpoint: string): void;
     registrateAPIError(endpoint: string): void;
     registrateResponse(endpoint: string, responseTime: number): void;
     increaseStat(statObject: Map<string, number>, endpoint: string): void;
     createStatObj(): IStatObject;
+    createSystemStatObj(): ISystemStat;
     getDateIndex(d: Date): number;
     getHourMinuteIndex(d: Date): string;
     leadZero(i: number): string;
@@ -24,9 +32,10 @@ export declare class Monitor extends BaseEndpoint {
     logs(req: HTTPRequestVO): Promise<TransferPacketVO<any>>;
     netlog(req: HTTPRequestVO): Promise<TransferPacketVO<any>>;
     metrics(req: HTTPRequestVO): Promise<TransferPacketVO<any>>;
-    mapToKeyValue(map: Map<string, number>): {
+    serverStat(req: HTTPRequestVO): Promise<TransferPacketVO<any>>;
+    mapToKeyValue(map: Map<string, string | number>): {
         name: string;
-        value: number;
+        value: string | number;
     }[];
 }
 export {};

package/dist/apiServer/monitor/Monitor.js

@@ -8,17 +8,29 @@ 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"));
 class Monitor extends BaseEndpoint_1.BaseEndpoint {
     ignoreHttpLogging = true;
-    startedAt = new Date();
+    startedAt = +new Date();
     httpRequests = new Map();
+    systemStat = new Map();
     constructor() {
         super("sys-monitor");
         this.registerEndpoints([
             { ignoreInterceptor: true, endpoint: "log", handler: this.logs },
             { ignoreInterceptor: true, endpoint: "netlog", handler: this.netlog },
-            { ignoreInterceptor: true, endpoint: "metrics", handler: this.metrics }
+            { ignoreInterceptor: true, endpoint: "metrics", handler: this.metrics },
+            { ignoreInterceptor: true, endpoint: "server/stat", handler: this.serverStat }
         ]);
+        setInterval(() => {
+            this.addSystemStat();
+        }, 1000 * 60 * 10);
+        this.addSystemStat();
+    }
+    addSystemStat() {
+        const so = this.createSystemStatObj();
+        so.memoryUsage = process.memoryUsage();
+        so.memoryTotal = os_1.default.totalmem();
     }
     registrateError(endpoint) {
         const so = this.createStatObj();
@@ -66,6 +78,33 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
                 fatalErrors: new Map(),
                 apiErrors: new Map()
             };
+            day.set(hourMinute, hm);
+        }
+        return hm;
+    }
+    createSystemStatObj() {
+        const d = new Date();
+        const dtm = this.getDateIndex(d);
+        let day = this.systemStat.get(dtm);
+        if (!day) {
+            day = new Map();
+            this.systemStat.set(dtm, day);
+            if (this.systemStat.size > 14) {
+                for (let i of this.systemStat) {
+                    this.systemStat.delete(i[0]);
+                    break;
+                }
+            }
+        }
+        const hourMinute = this.getHourMinuteIndex(d);
+        let hm = day.get(hourMinute);
+        if (!hm) {
+            hm = {
+                cpuUsage: 0,
+                memoryTotal: 0,
+                memoryUsage: {}
+            };
+            day.set(hourMinute, hm);
         }
         return hm;
     }
@@ -94,6 +133,7 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
         let authorized = false;
         for (let i of req.precheck.data) {
             let expectationStr = "";
+            expectationStr += req.endpoint;
             expectationStr += JSON.stringify(i);
             expectationStr += JSON.stringify(req.method);
             expectationStr += JSON.stringify(req.data);
@@ -136,6 +176,27 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
         }
         return { data: { stat: result, date: +date } };
     }
+    async serverStat(req) {
+        const date = new Date();
+        const di = this.getDateIndex(date);
+        const stat = this.systemStat.get(di);
+        if (!stat)
+            return { data: [] };
+        let result = [];
+        for (let minutes of stat) {
+            result.push({
+                m: minutes[0],
+                mt: minutes[1].memoryTotal,
+                mu: minutes[1].memoryUsage,
+                cu: minutes[1].cpuUsage,
+            });
+        }
+        return { data: {
+                uptime: process.uptime,
+                osUptime: os_1.default.uptime,
+                stat: result
+            } };
+    }
     mapToKeyValue(map) {
         const res = [];
         for (let i of map)

package/package.json

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