badmfck-api-server 4.1.59 → 5.0.2

package/dist/apiServer/helper/Validator.js

@@ -60,6 +60,10 @@ class Validator {
         }
         if (s_options.ignore_in_documentation === undefined && structure[k + "ignore_in_documentation"] !== undefined)
             s_options.ignore_in_documentation = structure[k + "ignore_in_documentation"];
+        if (s_options.values === undefined && structure[k + "values"] !== undefined)
+            s_options.values = structure[k + "values"];
+        if (s_options.values === undefined && typeof structure[key] === "string" && structure[key].includes(","))
+            s_options.values = structure[key].split(",").map((v) => v.trim()).filter((v) => v.length > 0);
         if (s_options.min && isNaN(s_options.min))
             s_options.min = undefined;
         if (s_options.max == undefined || isNaN(s_options.max)) {

package/dist/apiServer/http/Http.d.ts

@@ -35,6 +35,9 @@ export type THttpHostStats = {
     avgMs: number;
     minMs: number;
     maxMs: number;
+    p50Ms: number;
+    p95Ms: number;
+    p99Ms: number;
     totalTimeMs: number;
     inFlight: number;
     byStatus: {
@@ -144,6 +147,10 @@ export declare class Http {
     private static _incInFlight;
     private static _decInFlight;
     private static _updateStats;
+    private static _LAT_CAP;
+    private static _latency;
+    private static _recordLatency;
+    private static _percentiles;
     private static _pushToTopSlow;
     static getHttpStats(): THttpStatsSnapshot;
     private static ensureInit;

package/dist/apiServer/http/Http.js

@@ -217,7 +217,7 @@ class Http {
             h = {
                 host,
                 count: 0, errors: 0, timeouts: 0, retries: 0,
-                avgMs: 0, minMs: Infinity, maxMs: 0, totalTimeMs: 0,
+                avgMs: 0, minMs: Infinity, maxMs: 0, p50Ms: 0, p95Ms: 0, p99Ms: 0, totalTimeMs: 0,
                 inFlight: 0,
                 byStatus: { s2xx: 0, s3xx: 0, s4xx: 0, s5xx: 0, other: 0, networkErrors: 0 },
                 lastRequestAt: 0,
@@ -231,6 +231,7 @@ class Http {
             h.minMs = entry.time;
         if (entry.time > h.maxMs)
             h.maxMs = entry.time;
+        this._recordLatency(host, entry.time);
         if (!entry.ok)
             h.errors++;
         if (isTimeout)
@@ -254,6 +255,27 @@ class Http {
             h.byStatus.networkErrors++;
         }
     }
+    static _LAT_CAP = 1024;
+    static _latency = new Map();
+    static _recordLatency(host, ms) {
+        let r = this._latency.get(host);
+        if (!r) {
+            r = { s: new Array(this._LAT_CAP), pos: 0, n: 0 };
+            this._latency.set(host, r);
+        }
+        r.s[r.pos] = ms;
+        r.pos = (r.pos + 1) % this._LAT_CAP;
+        if (r.n < this._LAT_CAP)
+            r.n++;
+    }
+    static _percentiles(host) {
+        const r = this._latency.get(host);
+        if (!r || r.n === 0)
+            return { p50: 0, p95: 0, p99: 0 };
+        const arr = r.s.slice(0, r.n).sort((a, b) => a - b);
+        const pick = (p) => arr[Math.min(arr.length - 1, Math.max(0, Math.ceil((p / 100) * arr.length) - 1))];
+        return { p50: pick(50), p95: pick(95), p99: pick(99) };
+    }
     static _pushToTopSlow(entry) {
         if (this._topSlow.length < this._topSlowLimit) {
             this._topSlow.push(entry);
@@ -269,11 +291,15 @@ class Http {
     }
     static getHttpStats() {
         const perHost = Array.from(this._perHost.values())
-            .map(h => ({
-            ...h,
-            minMs: Number.isFinite(h.minMs) ? h.minMs : 0,
-            inFlight: this._inFlightByHost.get(h.host) ?? 0,
-        }))
+            .map(h => {
+            const p = this._percentiles(h.host);
+            return {
+                ...h,
+                minMs: Number.isFinite(h.minMs) ? h.minMs : 0,
+                p50Ms: p.p50, p95Ms: p.p95, p99Ms: p.p99,
+                inFlight: this._inFlightByHost.get(h.host) ?? 0,
+            };
+        })
             .sort((a, b) => b.count - a.count);
         return {
             totalRequests: this._totalRequests,
@@ -494,6 +520,7 @@ class Http {
             const isTimeout = Http._isTimeoutError(networkErr);
             Http._updateStats(host, entry, isTimeout);
             Http._pushToTopSlow(entry);
+            MonitorService_1.S_STAT_REGISTRATE_HTTP_RESULT.invoke({ host, ok: result.ok, ms: entry.time });
             return result;
         };
         for (let attempt = 1; attempt <= retryCfg.maxAttempts; attempt++) {

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

@@ -34,6 +34,8 @@ export declare class Monitor extends BaseEndpoint {
     httpstats(req: HTTPRequestVO): Promise<TransferPacketVO>;
     inventory(req: HTTPRequestVO): Promise<TransferPacketVO>;
     metrics(req: HTTPRequestVO): Promise<TransferPacketVO>;
+    metricsWeeks(req: HTTPRequestVO): Promise<TransferPacketVO>;
+    metricsWeek(req: HTTPRequestVO): Promise<TransferPacketVO>;
     connections(req: HTTPRequestVO): Promise<TransferPacketVO>;
     db(req: HTTPRequestVO): Promise<TransferPacketVO>;
     checkAuthentication(req: HTTPRequestVO): Promise<string>;

package/dist/apiServer/monitor/Monitor.js

@@ -56,6 +56,10 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
                     range: "",
                     $__range_values: ["week", "day", "hour"]
                 } },
+            { ignoreInterceptor: true, endpoint: "metricsWeeks", handler: this.metricsWeeks },
+            { ignoreInterceptor: true, endpoint: "metricsWeek", handler: this.metricsWeek, validationModel: {
+                    weekKey: ""
+                } },
             { ignoreInterceptor: true, endpoint: "connections", handler: this.connections },
             { ignoreInterceptor: true, endpoint: "db", handler: this.db, validationModel: {
                     range: "",
@@ -201,6 +205,14 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
         const result = await MonitorService_1.REQ_STAT.request(req.data);
         return { data: result };
     }
+    async metricsWeeks(req) {
+        await this.checkAuthentication(req);
+        return { data: await MonitorService_1.REQ_STAT_WEEKS.request() };
+    }
+    async metricsWeek(req) {
+        await this.checkAuthentication(req);
+        return { data: await MonitorService_1.REQ_STAT_WEEK.request({ weekKey: req.data.weekKey }) };
+    }
     async connections(req) {
         await this.checkAuthentication(req);
         return { data: Http_1.Http.getActiveConnectionsSnapshot() };