badmfck-api-server 4.1.52 → 4.1.57

package/dist/apiServer/deployment/Deploy.js

@@ -3,109 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Deploy = void 0;
+exports.Deploy = Deploy;
 const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
 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");
@@ -365,7 +272,6 @@ async function Deploy(opt) {
     console.log("");
     return archiveName;
 }
-exports.Deploy = Deploy;
 function run(cmd) {
     try {
         return (0, child_process_1.execSync)(cmd, { encoding: "utf-8" });

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

@@ -32,14 +32,14 @@ export declare const REQ_DEPLOYMENT_PROCEED: Req<{
     };
 }, any>;
 export declare const REQ_DEPLOYMENT_SWITCH: Req<{
-    auth?: string | undefined;
+    auth?: string;
     name: string;
     token: string;
-    scheme?: "blue" | "green" | undefined;
+    scheme?: "blue" | "green";
 }, any>;
 export declare const REQ_DEPLOYMENT_STATUS: Req<{
-    auth?: string | undefined;
-    name?: string | undefined;
+    auth?: string;
+    name?: string;
 }, any>;
 export declare class DeployerService extends BaseService {
     options: IDeployerServiceOptions;
@@ -68,6 +68,7 @@ export declare class DeployerService extends BaseService {
         };
         data?: undefined;
     } | {
+        error?: undefined;
         data: {
             ok: boolean;
             project: string;
@@ -76,7 +77,6 @@ export declare class DeployerService extends BaseService {
             active: "blue" | "green" | null;
             activeThisDeploy: boolean;
         };
-        error?: undefined;
     }>;
     switchSlot(data: {
         auth?: string;
@@ -84,38 +84,38 @@ export declare class DeployerService extends BaseService {
         token: string;
         scheme?: "blue" | "green";
     }): Promise<{
+        data?: undefined;
         error: {
             code: number;
             message: string;
             httpStatus: number;
         };
-        data?: undefined;
     } | {
+        error?: undefined;
         data: {
             active: "blue" | "green";
             previousActive: "blue" | "green";
             action: "rollback" | "switch";
             hookError: string | null;
         };
-        error?: undefined;
     }>;
     status(data: {
         auth?: string;
         name?: string;
     }): Promise<{
+        data?: undefined;
         error: {
             code: number;
             message: string;
             httpStatus: number;
         };
-        data?: undefined;
     } | {
+        error?: undefined;
         data: Record<string, {
             hasBlueGreen: boolean;
             state: IProjectState | null;
             readyToSwitch: boolean;
         }>;
-        error?: undefined;
     }>;
     tokensMatch(a: string | undefined, b: string | undefined): boolean;
     private _checkUserAuth;

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,63 @@
+#!/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 [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 rest = process.argv.slice(3);
+    switch (command) {
+        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": {
+            const { scheme, config } = parseArgs(rest);
+            await (0, Activate_1.Activate)(config, 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,104 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateConfig = validateConfig;
+exports.resolveConfig = resolveConfig;
+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;
+}
+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;
+}