badmfck-api-server 1.5.8 → 1.5.9

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

@@ -7,7 +7,7 @@ interface IStatObject {
     apiErrors: Map<string, number>;
 }
 interface ISystemStat {
-    cpuUsage: number;
+    cpuUsage: any;
     memoryTotal: number;
     memoryUsage: any;
 }
@@ -33,9 +33,9 @@ export declare class Monitor extends BaseEndpoint {
     netlog(req: HTTPRequestVO): Promise<TransferPacketVO<any>>;
     metrics(req: HTTPRequestVO): Promise<TransferPacketVO<any>>;
     serverStat(req: HTTPRequestVO): Promise<TransferPacketVO<any>>;
-    mapToKeyValue(map: Map<string, number>): {
+    mapToKeyValue(map: Map<string, string | number>): {
         name: string;
-        value: number;
+        value: string | number;
     }[];
 }
 export {};

package/dist/apiServer/monitor/Monitor.js

@@ -177,12 +177,24 @@ 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: {
-                memory: {
-                    cpus: os_1.default.cpus(),
-                    uptime: process.uptime,
-                    osUptime: os_1.default.uptime
-                }
+                uptime: process.uptime,
+                osUptime: os_1.default.uptime,
+                stat: result
             } };
     }
     mapToKeyValue(map) {

package/package.json

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