badmfck-api-server 4.1.53 → 4.1.58

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/deployment/cli.js

@@ -5,27 +5,50 @@ const Deploy_1 = require("./Deploy");
 const Activate_1 = require("./Activate");
 function usage() {
     console.error("Usage:");
-    console.error("  badmfck deploy                 — build + upload the current project");
-    console.error("  badmfck activate [blue|green]  — switch blue-green slot (omit for lastDeployed)");
+    console.error("  badmfck deploy [config.json]                 — build + upload the current project");
+    console.error("  badmfck activate [config.json] [blue|green]  — switch blue-green slot (omit slot for lastDeployed)");
+    console.error("");
+    console.error("Config path is optional (auto-discovers deploy/ folder → deploy.json when omitted).");
+    console.error("Via npm, prefix args with --   e.g.  npm run deploy -- deploy/custom.json");
     process.exit(1);
 }
+function parseArgs(args) {
+    let scheme;
+    let config;
+    for (const a of args) {
+        if (a === "blue" || a === "green") {
+            if (scheme) {
+                console.error(`Slot specified twice ("${scheme}" and "${a}").`);
+                process.exit(1);
+            }
+            scheme = a;
+        }
+        else {
+            if (config) {
+                console.error(`Config path specified twice ("${config}" and "${a}").`);
+                process.exit(1);
+            }
+            config = a;
+        }
+    }
+    return { scheme, config };
+}
 async function main() {
     const command = process.argv[2];
-    const arg = process.argv[3];
+    const rest = process.argv.slice(3);
     switch (command) {
-        case "deploy":
-            await (0, Deploy_1.Deploy)();
+        case "deploy": {
+            const { scheme, config } = parseArgs(rest);
+            if (scheme) {
+                console.error(`"deploy" does not take a slot argument ("${scheme}").`);
+                process.exit(1);
+            }
+            await (0, Deploy_1.Deploy)(config);
             break;
+        }
         case "activate": {
-            let scheme;
-            if (arg !== undefined) {
-                if (arg !== "blue" && arg !== "green") {
-                    console.error(`Invalid slot "${arg}" — expected "blue" or "green".`);
-                    process.exit(1);
-                }
-                scheme = arg;
-            }
-            await (0, Activate_1.Activate)(undefined, scheme);
+            const { scheme, config } = parseArgs(rest);
+            await (0, Activate_1.Activate)(config, scheme);
             break;
         }
         default:

package/dist/apiServer/deployment/resolveConfig.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveConfig = exports.validateConfig = void 0;
+exports.validateConfig = validateConfig;
+exports.resolveConfig = resolveConfig;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const promises_1 = require("readline/promises");
@@ -21,7 +22,6 @@ function validateConfig(cfg) {
         return "switch_host must be a string";
     return null;
 }
-exports.validateConfig = validateConfig;
 async function selectConfig(configs) {
     if (configs.length === 0) {
         throw new Error("No valid deploy configs found");
@@ -102,4 +102,3 @@ async function resolveConfig(opt) {
     }
     return opt;
 }
-exports.resolveConfig = resolveConfig;