badmfck-api-server 4.1.52 → 4.1.53

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

@@ -1,10 +1,4 @@
-interface IActivateParams {
-    name: string;
-    token: string;
-    host: string;
-    username: string;
-    password: string;
-    switch_host?: string;
-}
-export declare function Activate(opt: IActivateParams | string, scheme?: "blue" | "green"): Promise<string>;
+import { IDeployerConfig } from "./resolveConfig";
+type IActivateParams = IDeployerConfig;
+export declare function Activate(opt?: IActivateParams | string | null, scheme?: "blue" | "green"): Promise<string>;
 export {};

package/dist/apiServer/deployment/Activate.js

@@ -4,20 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Activate = void 0;
-const fs_1 = __importDefault(require("fs"));
 const crypto_1 = __importDefault(require("crypto"));
 const __1 = require("../..");
+const resolveConfig_1 = require("./resolveConfig");
 async function Activate(opt, scheme) {
-    if (typeof opt === "string") {
-        const configPath = opt;
-        if (!fs_1.default.existsSync(configPath)) {
-            throw new Error(`Config file not found: ${configPath}`);
-        }
-        opt = JSON.parse(fs_1.default.readFileSync(configPath).toString("utf-8"));
-        if (!opt.name || !opt.token || !opt.host || !opt.username || !opt.password) {
-            throw new Error(`Invalid activate config file (missing required fields): ${configPath}`);
-        }
-    }
+    opt = await (0, resolveConfig_1.resolveConfig)(opt);
     if (scheme && scheme !== "blue" && scheme !== "green") {
         throw new Error(`Invalid scheme: ${scheme}. Must be "blue" or "green" (or omitted).`);
     }

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

@@ -1,11 +1,4 @@
-interface IDeployerParams {
-    name: string;
-    token: string;
-    host: string;
-    username: string;
-    password: string;
-    includes?: string[];
-    excludes?: string[];
-}
+import { IDeployerConfig } from "./resolveConfig";
+type IDeployerParams = IDeployerConfig;
 export declare function Deploy(opt?: IDeployerParams | string | null): Promise<string>;
 export {};

package/dist/apiServer/deployment/Deploy.js

@@ -10,102 +10,9 @@ const fs_1 = __importDefault(require("fs"));
 const __1 = require("../..");
 const crypto_1 = __importDefault(require("crypto"));
 const undici_1 = require("undici");
-const promises_1 = require("readline/promises");
-const process_1 = require("process");
-function validateConfig(cfg) {
-    if (!cfg || typeof cfg !== "object")
-        return "not an object";
-    if (!cfg.name || !cfg.token || !cfg.host || !cfg.username || !cfg.password)
-        return "missing one of: name, token, host, username, password";
-    if (cfg.includes && !Array.isArray(cfg.includes))
-        return "includes must be an array";
-    if (cfg.excludes && !Array.isArray(cfg.excludes))
-        return "excludes must be an array";
-    return null;
-}
-async function selectConfig(configs) {
-    if (configs.length === 0) {
-        throw new Error("No valid deploy configs found");
-    }
-    if (configs.length === 1) {
-        console.log(`Using deploy config: ${configs[0].name}`);
-        return configs[0];
-    }
-    if (!process_1.stdin.isTTY) {
-        throw new Error(`Found ${configs.length} deploy configs (${configs.map(c => c.name).join(", ")}) but stdin is not a TTY — ` +
-            `cannot prompt for a choice. Pass a specific config explicitly, e.g. Deploy("deploy/<name>.json").`);
-    }
-    console.log("\nAvailable deploy configs:\n");
-    configs.forEach((config, index) => {
-        console.log(`[${index + 1}] ${config.name ?? "bad-config-file"}`);
-    });
-    const rl = (0, promises_1.createInterface)({
-        input: process_1.stdin,
-        output: process_1.stdout,
-    });
-    try {
-        while (true) {
-            const answer = await rl.question(`\nChoose config [1-${configs.length}]: `);
-            const selectedIndex = Number.parseInt(answer.trim(), 10) - 1;
-            if (Number.isInteger(selectedIndex) &&
-                selectedIndex >= 0 &&
-                selectedIndex < configs.length) {
-                return configs[selectedIndex];
-            }
-            console.error(`Invalid selection. Enter a number from 1 to ${configs.length}.`);
-        }
-    }
-    finally {
-        rl.close();
-    }
-}
+const resolveConfig_1 = require("./resolveConfig");
 async function Deploy(opt) {
-    if (!opt) {
-        const dir = path_1.default.resolve("deploy");
-        const single = path_1.default.resolve("deploy.json");
-        if (fs_1.default.existsSync(dir) && fs_1.default.statSync(dir).isDirectory()) {
-            const files = fs_1.default.readdirSync(dir).filter(f => f.endsWith(".json"));
-            if (files.length === 0)
-                throw new Error(`No .json configs found in ${dir}`);
-            const configs = [];
-            for (const f of files) {
-                const filePath = path_1.default.resolve(dir, f);
-                let parsed;
-                try {
-                    parsed = JSON.parse(fs_1.default.readFileSync(filePath).toString("utf-8"));
-                }
-                catch (e) {
-                    console.error(`Skipping ${f}: failed to parse JSON:`, e.message);
-                    continue;
-                }
-                const reason = validateConfig(parsed);
-                if (reason) {
-                    console.error(`Skipping ${f}: ${reason}`);
-                    continue;
-                }
-                configs.push(parsed);
-            }
-            if (configs.length === 0)
-                throw new Error(`No valid deploy configs in ${dir} (all ${files.length} were skipped)`);
-            opt = await selectConfig(configs);
-        }
-        else if (fs_1.default.existsSync(single)) {
-            opt = single;
-        }
-        else {
-            throw new Error(`No deploy config found: neither ${dir}/ nor ${single} exists`);
-        }
-    }
-    if (typeof opt === "string") {
-        if (!fs_1.default.existsSync(opt)) {
-            throw new Error(`File not found: ${opt}`);
-        }
-        opt = JSON.parse(fs_1.default.readFileSync(opt).toString("utf-8"));
-    }
-    const invalidReason = validateConfig(opt);
-    if (invalidReason) {
-        throw new Error(`Invalid deploy config: ${invalidReason}`);
-    }
+    opt = await (0, resolveConfig_1.resolveConfig)(opt);
     const archiveName = __1.UID.sha256(opt.name.replaceAll(".", "_")) + ".tar.gz";
     console.log("Changing Config to live");
     const config = path_1.default.resolve("src", "Config.ts");

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

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/apiServer/deployment/cli.js

@@ -0,0 +1,40 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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)");
+    process.exit(1);
+}
+async function main() {
+    const command = process.argv[2];
+    const arg = process.argv[3];
+    switch (command) {
+        case "deploy":
+            await (0, Deploy_1.Deploy)();
+            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);
+            break;
+        }
+        default:
+            if (command)
+                console.error(`Unknown command: ${command}\n`);
+            usage();
+    }
+}
+main().catch((err) => {
+    console.error("\n" + (err instanceof Error ? err.message : String(err)));
+    process.exit(1);
+});

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

@@ -0,0 +1,12 @@
+export interface IDeployerConfig {
+    name: string;
+    token: string;
+    host: string;
+    username: string;
+    password: string;
+    includes?: string[];
+    excludes?: string[];
+    switch_host?: string;
+}
+export declare function validateConfig(cfg: any): string | null;
+export declare function resolveConfig(opt?: IDeployerConfig | string | null): Promise<IDeployerConfig>;

package/dist/apiServer/deployment/resolveConfig.js

@@ -0,0 +1,105 @@
+"use strict";
+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;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const promises_1 = require("readline/promises");
+const process_1 = require("process");
+function validateConfig(cfg) {
+    if (!cfg || typeof cfg !== "object")
+        return "not an object";
+    if (!cfg.name || !cfg.token || !cfg.host || !cfg.username || !cfg.password)
+        return "missing one of: name, token, host, username, password";
+    if (cfg.includes && !Array.isArray(cfg.includes))
+        return "includes must be an array";
+    if (cfg.excludes && !Array.isArray(cfg.excludes))
+        return "excludes must be an array";
+    if (cfg.switch_host && typeof cfg.switch_host !== "string")
+        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");
+    }
+    if (configs.length === 1) {
+        console.log(`Using deploy config: ${configs[0].name}`);
+        return configs[0];
+    }
+    if (!process_1.stdin.isTTY) {
+        throw new Error(`Found ${configs.length} deploy configs (${configs.map(c => c.name).join(", ")}) but stdin is not a TTY — ` +
+            `cannot prompt for a choice. Pass a specific config explicitly, e.g. "deploy/<name>.json".`);
+    }
+    console.log("\nAvailable deploy configs:\n");
+    configs.forEach((config, index) => {
+        console.log(`[${index + 1}] ${config.name ?? "bad-config-file"}`);
+    });
+    const rl = (0, promises_1.createInterface)({ input: process_1.stdin, output: process_1.stdout });
+    try {
+        while (true) {
+            const answer = await rl.question(`\nChoose config [1-${configs.length}]: `);
+            const selectedIndex = Number.parseInt(answer.trim(), 10) - 1;
+            if (Number.isInteger(selectedIndex) && selectedIndex >= 0 && selectedIndex < configs.length) {
+                return configs[selectedIndex];
+            }
+            console.error(`Invalid selection. Enter a number from 1 to ${configs.length}.`);
+        }
+    }
+    finally {
+        rl.close();
+    }
+}
+async function resolveConfig(opt) {
+    if (!opt) {
+        const dir = path_1.default.resolve("deploy");
+        const single = path_1.default.resolve("deploy.json");
+        if (fs_1.default.existsSync(dir) && fs_1.default.statSync(dir).isDirectory()) {
+            const files = fs_1.default.readdirSync(dir).filter(f => f.endsWith(".json"));
+            if (files.length === 0)
+                throw new Error(`No .json configs found in ${dir}`);
+            const configs = [];
+            for (const f of files) {
+                const filePath = path_1.default.resolve(dir, f);
+                let parsed;
+                try {
+                    parsed = JSON.parse(fs_1.default.readFileSync(filePath).toString("utf-8"));
+                }
+                catch (e) {
+                    console.error(`Skipping ${f}: failed to parse JSON:`, e.message);
+                    continue;
+                }
+                const reason = validateConfig(parsed);
+                if (reason) {
+                    console.error(`Skipping ${f}: ${reason}`);
+                    continue;
+                }
+                configs.push(parsed);
+            }
+            if (configs.length === 0)
+                throw new Error(`No valid deploy configs in ${dir} (all ${files.length} were skipped)`);
+            opt = await selectConfig(configs);
+        }
+        else if (fs_1.default.existsSync(single)) {
+            opt = single;
+        }
+        else {
+            throw new Error(`No deploy config found: neither ${dir}/ nor ${single} exists`);
+        }
+    }
+    if (typeof opt === "string") {
+        if (!fs_1.default.existsSync(opt)) {
+            throw new Error(`Config file not found: ${opt}`);
+        }
+        opt = JSON.parse(fs_1.default.readFileSync(opt).toString("utf-8"));
+    }
+    const invalidReason = validateConfig(opt);
+    if (invalidReason) {
+        throw new Error(`Invalid deploy config: ${invalidReason}`);
+    }
+    return opt;
+}
+exports.resolveConfig = resolveConfig;

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "badmfck-api-server",
-  "version": "4.1.52",
+  "version": "4.1.53",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "commonjs",
+  "bin": {
+    "badmfck": "dist/apiServer/deployment/cli.js"
+  },
   "scripts": {
-    "build": "npm version patch && tsc && cp ./src/apiServer/monitor/index.html ./dist/apiServer/monitor/index.html && cp ./src/apiServer/documentation/index.html ./dist/apiServer/documentation/index.html",
+    "build": "npm version patch && tsc && cp ./src/apiServer/monitor/index.html ./dist/apiServer/monitor/index.html && cp ./src/apiServer/documentation/index.html ./dist/apiServer/documentation/index.html && chmod +x ./dist/apiServer/deployment/cli.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [