badmfck-api-server 4.1.57 → 4.1.59

package/dist/apiServer/deployment/DeployerService.d.ts

@@ -122,6 +122,7 @@ export declare class DeployerService extends BaseService {
     private static _extractPort;
     private _renderNginx;
     runPM2(found: IConfig, projectState?: IProjectState | null): Promise<IError | null>;
+    private _verifyAutorestart;
     private static readonly SKIP_DIRS;
     private static readonly TEMPLATE_EXTENSIONS;
     applyConfig(dir: string, config: Record<string, string>): Promise<void>;

package/dist/apiServer/deployment/DeployerService.js

@@ -496,9 +496,12 @@ class DeployerService extends BaseService_1.BaseService {
         return new Promise((resolve) => {
             try {
                 (0, child_process_1.execFileSync)("pm2", ["--version"]);
-                const extra = Array.isArray(pm2Attrs)
+                const rawExtra = Array.isArray(pm2Attrs)
                     ? pm2Attrs.filter(s => typeof s === "string" && s.length > 0)
                     : [];
+                const extra = rawExtra.filter(a => !/^--no-autorestart(=.*)?$/.test(a));
+                if (extra.length !== rawExtra.length)
+                    (0, LogService_1.logWarn)(`Ignored "--no-autorestart" in pm2 attributes for "${found.name}" — autorestart is force-kept ON so the slot self-recovers.`);
                 const ecoJs = path_1.default.resolve(found.destination, "ecosystem.config.js");
                 const ecoCjs = path_1.default.resolve(found.destination, "ecosystem.config.cjs");
                 const ecosystem = fs_1.default.existsSync(ecoJs) ? ecoJs
@@ -506,6 +509,7 @@ class DeployerService extends BaseService_1.BaseService {
                         : null;
                 if (ecosystem) {
                     (0, child_process_1.execFileSync)("pm2", ["startOrReload", ecosystem, "--update-env", ...extra]);
+                    this._verifyAutorestart(found.name);
                     resolve(null);
                     return;
                 }
@@ -530,6 +534,7 @@ class DeployerService extends BaseService_1.BaseService {
                     catch { }
                 }
                 (0, child_process_1.execFileSync)("pm2", ["start", found.destination + main, "--name", found.name, ...extra]);
+                this._verifyAutorestart(found.name);
                 resolve(null);
             }
             catch (e) {
@@ -537,6 +542,18 @@ class DeployerService extends BaseService_1.BaseService {
             }
         });
     }
+    _verifyAutorestart(name) {
+        try {
+            const list = JSON.parse((0, child_process_1.execFileSync)("pm2", ["jlist"]).toString());
+            const proc = Array.isArray(list) ? list.find((p) => p?.name === name) : null;
+            if (proc?.pm2_env && proc.pm2_env.autorestart === false) {
+                (0, LogService_1.logWarn)(`pm2 autorestart is DISABLED for "${name}" — the slot will NOT respawn after a restart/exit. Check the project's ecosystem.config (autorestart:false).`);
+            }
+        }
+        catch (e) {
+            (0, LogService_1.logWarn)(`Could not verify pm2 autorestart for "${name}": ${e?.message ?? e}`);
+        }
+    }
     static SKIP_DIRS = new Set(["node_modules", ".git", "__tmp"]);
     static TEMPLATE_EXTENSIONS = [".js", ".ts", ".json", ".env"];
     async applyConfig(dir, config) {

package/dist/apiServer/helper/Validator.js

@@ -401,6 +401,20 @@ class Validator {
                 else if (Array.isArray(tmpl) && Array.isArray(item)) {
                     out[i] = this.syncStructure(tmpl, item);
                 }
+                else if (!this.isPlainObject(tmpl) && !Array.isArray(tmpl)) {
+                    const wantType = typeof tmpl;
+                    if (typeof item === wantType) {
+                        out[i] = item;
+                    }
+                    else if (wantType === "string" || wantType === "number" || wantType === "boolean") {
+                        const converted = this.convertToType(item, wantType);
+                        const bad = converted === null || (wantType === "number" && Number.isNaN(converted));
+                        out[i] = bad ? this.clone(tmpl) : converted;
+                    }
+                    else {
+                        out[i] = item;
+                    }
+                }
                 else {
                     out[i] = this.syncStructure(tmpl, this.clone(tmpl));
                 }

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;
@@ -24,10 +30,11 @@ export declare class Monitor extends BaseEndpoint {
     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,
@@ -46,6 +47,9 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
             { 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: {
@@ -145,6 +149,23 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
         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() };
@@ -201,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

@@ -37,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;
@@ -117,6 +125,14 @@ 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;

package/dist/apiServer/monitor/ProcessMonitor.js

@@ -198,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,
@@ -243,6 +244,18 @@ class ProcessMonitor {
             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(),