badmfck-api-server 4.1.53 → 4.1.58

package/dist/apiServer/external/ExternalService.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/apiServer/external/MicroserviceClient.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/apiServer/external/MicroserviceHost.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/apiServer/external/MicroserviceHostController.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MicroserviceHostController = void 0;
 const BaseEndpoint_1 = require("../BaseEndpoint");

package/dist/apiServer/helper/JSONStableStringify.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JSONStableStringify = void 0;
+exports.JSONStableStringify = JSONStableStringify;
 function JSONStableStringify(obj) {
     if (obj === null || typeof obj !== "object") {
         return JSON.stringify(obj);
@@ -13,4 +13,3 @@ function JSONStableStringify(obj) {
         keys.map(k => JSON.stringify(k) + ":" + JSONStableStringify(obj[k])).join(",") +
         "}");
 }
-exports.JSONStableStringify = JSONStableStringify;

package/dist/apiServer/helper/YYYYMMDDHH.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.YYYYMMDDHH_toDate = exports.YYYYMMDDHH = void 0;
+exports.YYYYMMDDHH = YYYYMMDDHH;
+exports.YYYYMMDDHH_toDate = YYYYMMDDHH_toDate;
 function YYYYMMDDHH(date, format = "yyyymmddhh") {
     const year = date.getFullYear();
     const month = String(date.getMonth() + 1).padStart(2, "0");
@@ -20,7 +21,6 @@ function YYYYMMDDHH(date, format = "yyyymmddhh") {
             return `${year}${month}${day}${hours}`;
     }
 }
-exports.YYYYMMDDHH = YYYYMMDDHH;
 function YYYYMMDDHH_toDate(yyyymmddhh) {
     const str = String(yyyymmddhh);
     const year = parseInt(str.slice(0, 4), 10);
@@ -29,4 +29,3 @@ function YYYYMMDDHH_toDate(yyyymmddhh) {
     const hours = parseInt(str.slice(8, 10), 10);
     return new Date(year, month, day, hours);
 }
-exports.YYYYMMDDHH_toDate = YYYYMMDDHH_toDate;

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

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 export declare class ZipUtils {
     static zipBufferToBase64: (input: Buffer) => string;
     static unzipBase64ToBuffer: (base64: string) => Buffer;

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

@@ -6,6 +6,12 @@ export interface IUserAction {
     action: string;
 }
 export declare const S_MONITOR_REGISTRATE_ACTION: Signal<IUserAction>;
+export interface IRestartRequest {
+    by: string;
+    name: string | null;
+    pmId: string | null;
+}
+export declare const S_MONITOR_RESTART_REQUESTED: Signal<IRestartRequest>;
 export declare class Monitor extends BaseEndpoint {
     ignoreHttpLogging: boolean;
     ignoreInDocumentation: boolean;
@@ -23,10 +29,12 @@ export declare class Monitor extends BaseEndpoint {
     outgoingNetlog(req: HTTPRequestVO): Promise<TransferPacketVO>;
     sysinfo(req: HTTPRequestVO): Promise<TransferPacketVO>;
     procinfo(req: HTTPRequestVO): Promise<TransferPacketVO>;
+    fdreport(req: HTTPRequestVO): Promise<TransferPacketVO>;
+    restart(req: HTTPRequestVO): Promise<TransferPacketVO>;
     httpstats(req: HTTPRequestVO): Promise<TransferPacketVO>;
     inventory(req: HTTPRequestVO): Promise<TransferPacketVO>;
     metrics(req: HTTPRequestVO): Promise<TransferPacketVO>;
     connections(req: HTTPRequestVO): Promise<TransferPacketVO>;
     db(req: HTTPRequestVO): Promise<TransferPacketVO>;
-    checkAuthentication(req: HTTPRequestVO): Promise<void>;
+    checkAuthentication(req: HTTPRequestVO): Promise<string>;
 }

package/dist/apiServer/monitor/Monitor.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Monitor = exports.S_MONITOR_REGISTRATE_ACTION = void 0;
+exports.Monitor = exports.S_MONITOR_RESTART_REQUESTED = exports.S_MONITOR_REGISTRATE_ACTION = void 0;
 const badmfck_signal_1 = require("badmfck-signal");
 const APIService_1 = require("../APIService");
 const BaseEndpoint_1 = require("../BaseEndpoint");
@@ -19,6 +19,7 @@ const DBService_1 = require("../DBService");
 const SystemInfo_1 = require("./SystemInfo");
 const ProcessMonitor_1 = require("./ProcessMonitor");
 exports.S_MONITOR_REGISTRATE_ACTION = new badmfck_signal_1.Signal();
+exports.S_MONITOR_RESTART_REQUESTED = new badmfck_signal_1.Signal();
 const logMap = {
     ALL: 10,
     API: 19,
@@ -45,6 +46,10 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
             { ignoreInterceptor: true, endpoint: "outgoingnetlog", handler: this.outgoingNetlog },
             { ignoreInterceptor: true, endpoint: "sysinfo", handler: this.sysinfo },
             { ignoreInterceptor: true, endpoint: "procinfo", handler: this.procinfo },
+            { ignoreInterceptor: true, endpoint: "fdreport", handler: this.fdreport },
+            { ignoreInterceptor: true, endpoint: "restart", handler: this.restart, validationModel: {
+                    confirm: ""
+                } },
             { ignoreInterceptor: true, endpoint: "inventory", handler: this.inventory },
             { ignoreInterceptor: true, endpoint: "httpstats", handler: this.httpstats },
             { ignoreInterceptor: true, endpoint: "metrics", handler: this.metrics, validationModel: {
@@ -140,6 +145,27 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
         await this.checkAuthentication(req);
         return { data: await ProcessMonitor_1.ProcessMonitor.getSnapshot() };
     }
+    async fdreport(req) {
+        await this.checkAuthentication(req);
+        return { data: await ProcessMonitor_1.ProcessMonitor.getFdReport() };
+    }
+    async restart(req) {
+        const login = await this.checkAuthentication(req);
+        const id = ProcessMonitor_1.ProcessMonitor.getPm2Identity();
+        if (!id.managed)
+            throw { ...DefaultErrors_1.default.BAD_REQUEST, details: "Process is not managed by pm2 (no pm_id in env) — refusing to exit, nothing would restart it." };
+        if (req.data.confirm !== id.name)
+            throw { ...DefaultErrors_1.default.BAD_REQUEST, details: `Confirmation mismatch. To restart send { "confirm": "${id.name}" }.` };
+        exports.S_MONITOR_RESTART_REQUESTED.invoke({ by: login, name: id.name, pmId: id.pmId });
+        exports.S_MONITOR_REGISTRATE_ACTION.invoke({ action: `restart requested by "${login}" for pm2 "${id.name}" (id ${id.pmId})` });
+        (0, LogService_1.logInfo)(`Restart requested via monitor by "${login}" for pm2 process "${id.name}" (id ${id.pmId})`, "Monitor");
+        const graceMs = 750;
+        setTimeout(() => {
+            (0, LogService_1.logInfo)(`Exiting now for pm2 restart (requested by "${login}")`, "Monitor");
+            process.exit(0);
+        }, graceMs);
+        return { data: { restarting: true, name: id.name, pmId: id.pmId, by: login, graceMs } };
+    }
     async httpstats(req) {
         await this.checkAuthentication(req);
         return { data: Http_1.Http.getHttpStats() };
@@ -196,7 +222,7 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
         for (let i of users) {
             const hash = crypto_1.default.createHash("sha256").update(i.login + ":" + i.password).digest("hex");
             if (hash === header) {
-                return;
+                return i.login;
             }
         }
         throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "Invalid user" };

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export declare class ProcessMonitor {
     private static _inited;
     private static _eld;
@@ -10,7 +9,11 @@ export declare class ProcessMonitor {
     private static _eluPrev;
     private static _elu;
     private static _processStartedAt;
+    private static _fdHistory;
+    private static _fdHistoryMax;
+    private static _fdSampleEveryMs;
     static init(): void;
+    private static _sampleFdSeries;
     private static _sampleCpu;
     private static _sampleELU;
     private static _mapGcKind;
@@ -34,6 +37,14 @@ export declare class ProcessMonitor {
             startedAtUnix: number;
             uptimeSec: number;
             availableParallelism: number;
+            pm2: {
+                managed: boolean;
+                name: string | null;
+                pmId: string | null;
+                instanceId: string | null;
+                execPath: string | null;
+                cwd: string | null;
+            };
         };
         memory: {
             rss: number;
@@ -99,6 +110,14 @@ export declare class ProcessMonitor {
             limitSoft: number | null;
             limitHard: number | null;
         };
+        sockets: {
+            total: number;
+            byState: Record<string, number>;
+            topRemotes: Array<{
+                host: string;
+                established: number;
+            }>;
+        } | null;
         io: Record<string, number> | null;
         limits: Record<string, {
             soft: string;
@@ -106,10 +125,51 @@ export declare class ProcessMonitor {
             unit: string;
         }> | null;
     }>;
+    static getPm2Identity(): {
+        managed: boolean;
+        name: string | null;
+        pmId: string | null;
+        instanceId: string | null;
+        execPath: string | null;
+        cwd: string | null;
+    };
+    static getFdReport(): Promise<{
+        now: {
+            ts: number;
+            fdOpen: number | null;
+            limitSoft: number | null;
+            limitHard: number | null;
+            sockets: {
+                total: number;
+                byState: Record<string, number>;
+                topRemotes: Array<{
+                    host: string;
+                    established: number;
+                }>;
+            } | null;
+        };
+        sampleEveryMs: number;
+        historyMax: number;
+        history: {
+            ts: number;
+            fdOpen: number | null;
+            fdSoftLimit: number | null;
+            socketTotal: number | null;
+            byState: Record<string, number>;
+            topRemote: {
+                host: string;
+                established: number;
+            } | null;
+            rss: number;
+        }[];
+    }>;
     private static _readProcStatus;
     private static _readProcIo;
     private static _readProcLimits;
     private static _countFds;
+    private static _readSocketBreakdown;
+    private static _tcpState;
+    private static _parseHexAddr;
     private static _parseLimitValue;
     private static _toMsFinite;
     private static _safePercentileMs;

package/dist/apiServer/monitor/ProcessMonitor.js

@@ -25,6 +25,9 @@ class ProcessMonitor {
     static _eluPrev = perf_hooks_1.performance.eventLoopUtilization();
     static _elu = { idle: 0, active: 0, utilizationPct: 0 };
     static _processStartedAt = Date.now() - process.uptime() * 1000;
+    static _fdHistory = [];
+    static _fdHistoryMax = 300;
+    static _fdSampleEveryMs = Math.max(1, parseInt(process.env.MONITOR_FD_SAMPLE_MINUTES || "10", 10) || 10) * 60 * 1000;
     static init() {
         if (this._inited)
             return;
@@ -62,6 +65,28 @@ class ProcessMonitor {
         const eluTimer = setInterval(() => this._sampleELU(), 5000);
         if (eluTimer.unref)
             eluTimer.unref();
+        this._sampleFdSeries().catch(() => { });
+        const fdTimer = setInterval(() => this._sampleFdSeries().catch(() => { }), this._fdSampleEveryMs);
+        if (fdTimer.unref)
+            fdTimer.unref();
+    }
+    static async _sampleFdSeries() {
+        const fdOpen = await this._countFds();
+        const sockets = await this._readSocketBreakdown();
+        const limits = await this._readProcLimits();
+        const softRaw = limits?.["Max open files"]?.soft;
+        const mem = process.memoryUsage();
+        this._fdHistory.push({
+            ts: Date.now(),
+            fdOpen,
+            fdSoftLimit: softRaw ? this._parseLimitValue(softRaw) : null,
+            socketTotal: sockets ? sockets.total : null,
+            byState: sockets ? sockets.byState : {},
+            topRemote: sockets && sockets.topRemotes.length > 0 ? sockets.topRemotes[0] : null,
+            rss: mem.rss,
+        });
+        if (this._fdHistory.length > this._fdHistoryMax)
+            this._fdHistory.shift();
     }
     static _sampleCpu() {
         const now = process.cpuUsage();
@@ -137,6 +162,7 @@ class ProcessMonitor {
         const fdOpen = await this._countFds();
         const fdSoft = limitsParsed?.["Max open files"]?.soft;
         const fdHard = limitsParsed?.["Max open files"]?.hard;
+        const sockets = await this._readSocketBreakdown();
         const h = this._eld;
         const eventLoop = h ? {
             minMs: this._toMsFinite(h.min),
@@ -172,6 +198,7 @@ class ProcessMonitor {
                 availableParallelism: typeof os_1.default.availableParallelism === "function"
                     ? os_1.default.availableParallelism()
                     : os_1.default.cpus().length,
+                pm2: this.getPm2Identity(),
             },
             memory: {
                 rss: mem.rss,
@@ -212,10 +239,44 @@ class ProcessMonitor {
                 limitSoft: fdSoft ? this._parseLimitValue(fdSoft) : null,
                 limitHard: fdHard ? this._parseLimitValue(fdHard) : null,
             },
+            sockets,
             io,
             limits: limitsParsed,
         };
     }
+    static getPm2Identity() {
+        const env = process.env;
+        const pmId = env.pm_id ?? null;
+        return {
+            managed: pmId !== null && pmId !== "",
+            name: env.name ?? null,
+            pmId,
+            instanceId: env.NODE_APP_INSTANCE ?? null,
+            execPath: env.pm_exec_path ?? null,
+            cwd: env.pm_cwd ?? null,
+        };
+    }
+    static async getFdReport() {
+        const [sockets, limits, fdOpen] = await Promise.all([
+            this._readSocketBreakdown(),
+            this._readProcLimits(),
+            this._countFds(),
+        ]);
+        const softRaw = limits?.["Max open files"]?.soft;
+        const hardRaw = limits?.["Max open files"]?.hard;
+        return {
+            now: {
+                ts: Date.now(),
+                fdOpen,
+                limitSoft: softRaw ? this._parseLimitValue(softRaw) : null,
+                limitHard: hardRaw ? this._parseLimitValue(hardRaw) : null,
+                sockets,
+            },
+            sampleEveryMs: this._fdSampleEveryMs,
+            historyMax: this._fdHistoryMax,
+            history: this._fdHistory,
+        };
+    }
     static async _readProcStatus() {
         try {
             const txt = await promises_1.default.readFile(`/proc/${process.pid}/status`, "utf-8");
@@ -278,6 +339,105 @@ class ProcessMonitor {
             return null;
         }
     }
+    static async _readSocketBreakdown() {
+        try {
+            const fdDir = `/proc/${process.pid}/fd`;
+            const fds = await promises_1.default.readdir(fdDir);
+            const inodes = new Set();
+            await Promise.all(fds.map(async (fd) => {
+                try {
+                    const link = await promises_1.default.readlink(`${fdDir}/${fd}`);
+                    const m = link.match(/^socket:\[(\d+)\]$/);
+                    if (m)
+                        inodes.add(m[1]);
+                }
+                catch { }
+            }));
+            if (inodes.size === 0)
+                return { total: 0, byState: {}, topRemotes: [] };
+            const byState = {};
+            const remoteEstab = {};
+            let total = 0;
+            for (const [file, isV6] of [["/proc/net/tcp", false], ["/proc/net/tcp6", true]]) {
+                let txt;
+                try {
+                    txt = await promises_1.default.readFile(file, "utf-8");
+                }
+                catch {
+                    continue;
+                }
+                for (const line of txt.split("\n").slice(1)) {
+                    const parts = line.trim().split(/\s+/);
+                    if (parts.length < 10)
+                        continue;
+                    const inode = parts[9];
+                    if (!inodes.has(inode))
+                        continue;
+                    total++;
+                    const state = this._tcpState(parts[3]);
+                    byState[state] = (byState[state] ?? 0) + 1;
+                    if (state === "ESTABLISHED") {
+                        const host = this._parseHexAddr((parts[2] ?? "").split(":")[0], isV6);
+                        remoteEstab[host] = (remoteEstab[host] ?? 0) + 1;
+                    }
+                }
+            }
+            const topRemotes = Object.entries(remoteEstab)
+                .map(([host, established]) => ({ host, established }))
+                .sort((a, b) => b.established - a.established)
+                .slice(0, 10);
+            return { total, byState, topRemotes };
+        }
+        catch {
+            return null;
+        }
+    }
+    static _tcpState(hex) {
+        switch ((hex || "").toUpperCase()) {
+            case "01": return "ESTABLISHED";
+            case "02": return "SYN_SENT";
+            case "03": return "SYN_RECV";
+            case "04": return "FIN_WAIT1";
+            case "05": return "FIN_WAIT2";
+            case "06": return "TIME_WAIT";
+            case "07": return "CLOSE";
+            case "08": return "CLOSE_WAIT";
+            case "09": return "LAST_ACK";
+            case "0A": return "LISTEN";
+            case "0B": return "CLOSING";
+            case "0C": return "NEW_SYN_RECV";
+            default: return "UNKNOWN(" + hex + ")";
+        }
+    }
+    static _parseHexAddr(hex, isV6) {
+        try {
+            if (!isV6) {
+                if (hex.length !== 8)
+                    return hex;
+                return [
+                    parseInt(hex.slice(6, 8), 16),
+                    parseInt(hex.slice(4, 6), 16),
+                    parseInt(hex.slice(2, 4), 16),
+                    parseInt(hex.slice(0, 2), 16),
+                ].join(".");
+            }
+            if (hex.length !== 32)
+                return hex;
+            const bytes = [];
+            for (let w = 0; w < 4; w++) {
+                const word = hex.slice(w * 8, w * 8 + 8);
+                for (let b = 3; b >= 0; b--)
+                    bytes.push(parseInt(word.slice(b * 2, b * 2 + 2), 16));
+            }
+            const hextets = [];
+            for (let i = 0; i < 16; i += 2)
+                hextets.push((((bytes[i] << 8) | bytes[i + 1]) >>> 0).toString(16));
+            return hextets.join(":");
+        }
+        catch {
+            return hex;
+        }
+    }
     static _parseLimitValue(v) {
         if (v === "unlimited")
             return -1;

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

@@ -1,18 +1,17 @@
-/// <reference types="node" />
 export declare function collectSystemInfo(): Promise<{
     cpu: {
-        usage: {
-            userPct: number;
-            systemPct: number;
-            idlePct: number;
-            iowaitPct: number;
-        } | null;
         count: number;
         models: Record<string, number>;
         loadAvg: number[];
         platform: NodeJS.Platform;
         arch: NodeJS.Architecture;
         uptimeSec: number;
+        usage: {
+            userPct: number;
+            systemPct: number;
+            idlePct: number;
+            iowaitPct: number;
+        } | null;
     };
     memory: {
         total: number;
@@ -61,9 +60,9 @@ export declare function collectSystemInfo(): Promise<{
         error: string;
         processes?: undefined;
     } | {
+        error?: undefined;
         installed: boolean;
         processes: any;
-        error?: undefined;
     } | {
         installed: boolean;
         error: string;

package/dist/apiServer/monitor/SystemInfo.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.collectSystemInfo = void 0;
+exports.collectSystemInfo = collectSystemInfo;
 const os_1 = __importDefault(require("os"));
 const child_process_1 = require("child_process");
 const util_1 = require("util");
@@ -215,4 +215,3 @@ async function collectSystemInfo() {
         pm2: pm2Data,
     };
 }
-exports.collectSystemInfo = collectSystemInfo;