badmfck-api-server 5.0.1 → 5.0.3

package/dist/apiServer/APIService.js

@@ -595,11 +595,12 @@ class APIService extends BaseService_1.BaseService {
     checkDataLength(data, result, lvl) {
         let json = "";
         try {
-            json = JSON.stringify(data, (k, v) => {
+            const s = JSON.stringify(data, (k, v) => {
                 if (typeof v === 'string' && v.length > 255)
                     return v.slice(0, 255) + `...(${v.length})`;
                 return v;
             });
+            json = typeof s === "string" ? s : "";
         }
         catch (e) {
             json = "[unserializable data]";

package/dist/apiServer/MonitorService.d.ts

@@ -15,6 +15,11 @@ export declare const S_STAT_REGISTRATE_SERVICE: Signal<string>;
 export declare const S_STAT_REGISTRATE_HTTP_REQUEST: Signal<{
     url: string;
 }>;
+export declare const S_STAT_REGISTRATE_HTTP_RESULT: Signal<{
+    host: string;
+    ok: boolean;
+    ms: number;
+}>;
 export declare const S_STAT_REGISTRATE_SQL_REQUEST: Signal<{
     success: boolean;
     query: string;
@@ -39,6 +44,9 @@ type IMonitorSlot = {
     successEp: Record<string, number>;
     failEp: Record<string, number>;
     http: Record<string, number>;
+    http_ok: Record<string, number>;
+    http_fail: Record<string, number>;
+    httpP95: Record<string, number>;
     success_sql: Record<string, number>;
     fail_sql: Record<string, number>;
 };
@@ -49,6 +57,7 @@ export declare class MonitorService extends BaseService {
     lastTimestamp: number | null;
     private metricsDir;
     private static MAX_WEEKS;
+    private static SCHEMA_VERSION;
     private _persistReady;
     private _flushedUpTo;
     private _lastSeenWeekKey;
@@ -67,12 +76,17 @@ export declare class MonitorService extends BaseService {
     static normalizeUrl(url: string): string;
     private bumpCappedKey;
     private onHttpRequestRegistrate;
+    private _latByMinute;
+    private static LAT_CAP_PER_MIN;
+    private onHttpResultRegistrate;
+    private finalizeLatency;
     private onSQLRequestRegistrate;
     private getSlot;
     private liveFile;
     private archiveFile;
     private weekKey;
     private atomicWrite;
+    private normalizeSlot;
     private readJsonl;
     private persistTick;
     private rotate;

package/dist/apiServer/MonitorService.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MonitorService = exports.REQ_STAT_WEEK = exports.REQ_STAT_WEEKS = exports.REQ_STAT = exports.S_STAT_REGISTRATE_SQL_REQUEST = exports.S_STAT_REGISTRATE_HTTP_REQUEST = exports.S_STAT_REGISTRATE_SERVICE = exports.S_STAT_REGISTRATE_CUSTOM_EVENT = exports.S_STAT_REGISTRATE_REQUEST = void 0;
+exports.MonitorService = exports.REQ_STAT_WEEK = exports.REQ_STAT_WEEKS = exports.REQ_STAT = exports.S_STAT_REGISTRATE_SQL_REQUEST = exports.S_STAT_REGISTRATE_HTTP_RESULT = exports.S_STAT_REGISTRATE_HTTP_REQUEST = 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");
@@ -48,6 +48,7 @@ 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.S_STAT_REGISTRATE_HTTP_REQUEST = new badmfck_signal_1.default();
+exports.S_STAT_REGISTRATE_HTTP_RESULT = new badmfck_signal_1.default();
 exports.S_STAT_REGISTRATE_SQL_REQUEST = new badmfck_signal_1.default();
 exports.REQ_STAT = new badmfck_signal_1.Req(undefined, "REQ_STAT");
 exports.REQ_STAT_WEEKS = new badmfck_signal_1.Req(undefined, "REQ_STAT_WEEKS");
@@ -59,6 +60,7 @@ class MonitorService extends BaseService_1.BaseService {
     lastTimestamp = null;
     metricsDir;
     static MAX_WEEKS = 10;
+    static SCHEMA_VERSION = 2;
     _persistReady = false;
     _flushedUpTo = 0;
     _lastSeenWeekKey = null;
@@ -73,6 +75,7 @@ class MonitorService extends BaseService_1.BaseService {
         exports.REQ_STAT_WEEKS.listener = async () => this.listPersistedWeeks();
         exports.REQ_STAT_WEEK.listener = async (req) => this.readPersistedWeek(req.weekKey);
         exports.S_STAT_REGISTRATE_HTTP_REQUEST.subscribe((data) => this.onHttpRequestRegistrate(data));
+        exports.S_STAT_REGISTRATE_HTTP_RESULT.subscribe((data) => this.onHttpResultRegistrate(data));
         exports.S_STAT_REGISTRATE_SQL_REQUEST.subscribe((data) => this.onSQLRequestRegistrate(data));
         exports.S_STAT_REGISTRATE_REQUEST.subscribe((data) => this.onStatRegistrate(data));
         if (this.metricsDir) {
@@ -124,30 +127,38 @@ class MonitorService extends BaseService_1.BaseService {
                 successEp: {},
                 failEp: {},
                 http: {},
+                http_ok: {},
+                http_fail: {},
+                httpP95: {},
                 success_sql: {},
                 fail_sql: {}
             };
+            const sum = (dst, src) => {
+                if (!src)
+                    return;
+                for (const [k, v] of Object.entries(src))
+                    dst[k] = (dst[k] || 0) + v;
+            };
+            const maxInto = (dst, src) => {
+                if (!src)
+                    return;
+                for (const [k, v] of Object.entries(src))
+                    dst[k] = Math.max(dst[k] || 0, v);
+            };
             chunk.forEach(s => {
                 agg.cpu += s.cpu;
                 agg.memory.rss += s.memory.rss;
                 agg.memory.heapUsed += s.memory.heapUsed;
                 agg.memory.heapTotal += s.memory.heapTotal;
                 agg.memory.external += s.memory.external;
-                for (const [path, count] of Object.entries(s.successEp)) {
-                    agg.successEp[path] = (agg.successEp[path] || 0) + count;
-                }
-                for (const [path, count] of Object.entries(s.failEp)) {
-                    agg.failEp[path] = (agg.failEp[path] || 0) + count;
-                }
-                for (const [url, count] of Object.entries(s.http)) {
-                    agg.http[url] = (agg.http[url] || 0) + count;
-                }
-                for (const [query, count] of Object.entries(s.success_sql)) {
-                    agg.success_sql[query] = (agg.success_sql[query] || 0) + count;
-                }
-                for (const [query, count] of Object.entries(s.fail_sql)) {
-                    agg.fail_sql[query] = (agg.fail_sql[query] || 0) + count;
-                }
+                sum(agg.successEp, s.successEp);
+                sum(agg.failEp, s.failEp);
+                sum(agg.http, s.http);
+                sum(agg.http_ok, s.http_ok);
+                sum(agg.http_fail, s.http_fail);
+                sum(agg.success_sql, s.success_sql);
+                sum(agg.fail_sql, s.fail_sql);
+                maxInto(agg.httpP95, s.httpP95);
             });
             const len = chunk.length;
             agg.cpu = Number((agg.cpu / len).toFixed(2));
@@ -181,6 +192,7 @@ class MonitorService extends BaseService_1.BaseService {
         const usage = process.cpuUsage();
         const now = Date.now();
         const yyyymmddhhmm = parseInt((0, YYYYMMDDHH_1.YYYYMMDDHH)(new Date(now), "yyyymmddhhmm"));
+        this.finalizeLatency(yyyymmddhhmm);
         const slot = this.getSlot(yyyymmddhhmm);
         if (this.lastCpuUsage && this.lastTimestamp) {
             const diff = usage.user - this.lastCpuUsage.user;
@@ -239,6 +251,42 @@ class MonitorService extends BaseService_1.BaseService {
         const slot = this.getSlot(yyyymmddhhmm);
         this.bumpCappedKey(slot.http, MonitorService.normalizeUrl(data.url));
     }
+    _latByMinute = new Map();
+    static LAT_CAP_PER_MIN = 3000;
+    onHttpResultRegistrate(data) {
+        const minuteKey = parseInt((0, YYYYMMDDHH_1.YYYYMMDDHH)(new Date(), "yyyymmddhhmm"));
+        const slot = this.getSlot(minuteKey);
+        this.bumpCappedKey(data.ok ? slot.http_ok : slot.http_fail, data.host);
+        let hosts = this._latByMinute.get(minuteKey);
+        if (!hosts) {
+            hosts = new Map();
+            this._latByMinute.set(minuteKey, hosts);
+        }
+        let arr = hosts.get(data.host);
+        if (!arr) {
+            arr = [];
+            hosts.set(data.host, arr);
+        }
+        if (arr.length < MonitorService.LAT_CAP_PER_MIN)
+            arr.push(data.ms);
+    }
+    finalizeLatency(currentMinute, includeCurrent = false) {
+        for (const [minuteKey, hosts] of this._latByMinute) {
+            if (includeCurrent ? minuteKey > currentMinute : minuteKey >= currentMinute)
+                continue;
+            const slot = this.slots.get(Math.floor(minuteKey / 100))?.get(minuteKey);
+            if (slot) {
+                for (const [host, samples] of hosts) {
+                    if (!samples.length)
+                        continue;
+                    samples.sort((a, b) => a - b);
+                    const idx = Math.min(samples.length - 1, Math.max(0, Math.ceil(0.95 * samples.length) - 1));
+                    slot.httpP95[host] = samples[idx];
+                }
+            }
+            this._latByMinute.delete(minuteKey);
+        }
+    }
     onSQLRequestRegistrate(data) {
         const date = new Date();
         const yyyymmddhhmm = parseInt((0, YYYYMMDDHH_1.YYYYMMDDHH)(date, "yyyymmddhhmm"));
@@ -272,6 +320,9 @@ class MonitorService extends BaseService_1.BaseService {
                 successEp: {},
                 failEp: {},
                 http: {},
+                http_ok: {},
+                http_fail: {},
+                httpP95: {},
                 success_sql: {},
                 fail_sql: {}
             };
@@ -300,6 +351,31 @@ class MonitorService extends BaseService_1.BaseService {
         await promises_1.default.writeFile(tmp, content, "utf-8");
         await promises_1.default.rename(tmp, file);
     }
+    normalizeSlot(raw) {
+        if (!raw || typeof raw !== "object")
+            return null;
+        const key = Number(raw.yyyymmddhhii);
+        if (!Number.isFinite(key))
+            return null;
+        const num = (v) => (typeof v === "number" && Number.isFinite(v) ? v : 0);
+        const rec = (v) => {
+            const out = {};
+            if (v && typeof v === "object" && !Array.isArray(v))
+                for (const [k, val] of Object.entries(v))
+                    if (typeof val === "number" && Number.isFinite(val))
+                        out[k] = val;
+            return out;
+        };
+        const m = raw.memory && typeof raw.memory === "object" ? raw.memory : {};
+        return {
+            yyyymmddhhii: key,
+            cpu: num(raw.cpu),
+            memory: { rss: num(m.rss), heapUsed: num(m.heapUsed), heapTotal: num(m.heapTotal), external: num(m.external) },
+            successEp: rec(raw.successEp), failEp: rec(raw.failEp),
+            http: rec(raw.http), http_ok: rec(raw.http_ok), http_fail: rec(raw.http_fail), httpP95: rec(raw.httpP95),
+            success_sql: rec(raw.success_sql), fail_sql: rec(raw.fail_sql),
+        };
+    }
     async readJsonl(file) {
         const txt = await promises_1.default.readFile(file, "utf-8");
         const out = [];
@@ -308,7 +384,9 @@ class MonitorService extends BaseService_1.BaseService {
             if (!t)
                 continue;
             try {
-                out.push(JSON.parse(t));
+                const s = this.normalizeSlot(JSON.parse(t));
+                if (s)
+                    out.push(s);
             }
             catch { }
         }
@@ -318,6 +396,7 @@ class MonitorService extends BaseService_1.BaseService {
         if (!this.metricsDir)
             return;
         const nowKey = parseInt((0, YYYYMMDDHH_1.YYYYMMDDHH)(new Date(), "yyyymmddhhmm"));
+        this.finalizeLatency(nowKey, includeCurrentMinute);
         const pending = [];
         for (const dayMap of this.slots.values()) {
             for (const slot of dayMap.values()) {
@@ -404,19 +483,28 @@ class MonitorService extends BaseService_1.BaseService {
         const hourly = Array.from(byHour.entries())
             .sort((a, b) => a[0] - b[0])
             .map(([hourKey, arr]) => this.mergeSlots(hourKey, arr));
-        await this.atomicWrite(this.archiveFile(weekKey), JSON.stringify({ version: 1, weekKey, resolution: "hour", slots: hourly }));
+        await this.atomicWrite(this.archiveFile(weekKey), JSON.stringify({ version: MonitorService.SCHEMA_VERSION, weekKey, resolution: "hour", slots: hourly }));
         await promises_1.default.unlink(live).catch(() => { });
     }
     mergeSlots(key, arr) {
         const out = {
             yyyymmddhhii: key, cpu: 0,
             memory: { rss: 0, heapUsed: 0, heapTotal: 0, external: 0 },
-            successEp: {}, failEp: {}, http: {}, success_sql: {}, fail_sql: {},
+            successEp: {}, failEp: {}, http: {}, http_ok: {}, http_fail: {}, httpP95: {},
+            success_sql: {}, fail_sql: {},
         };
         const add = (dst, src) => {
+            if (!src)
+                return;
             for (const [k, v] of Object.entries(src))
                 dst[k] = (dst[k] || 0) + v;
         };
+        const maxInto = (dst, src) => {
+            if (!src)
+                return;
+            for (const [k, v] of Object.entries(src))
+                dst[k] = Math.max(dst[k] || 0, v);
+        };
         for (const s of arr) {
             out.cpu += s.cpu;
             out.memory.rss += s.memory.rss;
@@ -426,8 +514,11 @@ class MonitorService extends BaseService_1.BaseService {
             add(out.successEp, s.successEp);
             add(out.failEp, s.failEp);
             add(out.http, s.http);
+            add(out.http_ok, s.http_ok);
+            add(out.http_fail, s.http_fail);
             add(out.success_sql, s.success_sql);
             add(out.fail_sql, s.fail_sql);
+            maxInto(out.httpP95, s.httpP95);
         }
         const n = arr.length || 1;
         out.cpu = Number((out.cpu / n).toFixed(2));
@@ -506,7 +597,10 @@ class MonitorService extends BaseService_1.BaseService {
             }
             catch {
                 const txt = await promises_1.default.readFile(this.archiveFile(weekKey), "utf-8");
-                slots = (JSON.parse(txt)?.slots ?? []);
+                const rawSlots = JSON.parse(txt)?.slots;
+                slots = Array.isArray(rawSlots)
+                    ? rawSlots.map((r) => this.normalizeSlot(r)).filter((s) => s !== null)
+                    : [];
             }
         }
         catch {