badmfck-api-server 4.1.47 → 4.1.51

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

@@ -7,5 +7,5 @@ interface IDeployerParams {
     includes?: string[];
     excludes?: string[];
 }
-export declare function Deploy(opt: IDeployerParams | string): Promise<string>;
+export declare function Deploy(opt?: IDeployerParams | string | null): Promise<string>;
 export {};

package/dist/apiServer/deployment/Deploy.js

@@ -10,21 +10,101 @@ 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();
+    }
+}
 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"));
-        if (!opt.name || !opt.token || !opt.host || !opt.username || !opt.password) {
-            throw new Error(`Invalid deploy config file: ${opt}`);
-        }
-        if (opt.includes && !Array.isArray(opt.includes)) {
-            throw new Error(`Invalid deploy config file: includes must be an array`);
-        }
-        if (opt.excludes && !Array.isArray(opt.excludes)) {
-            throw new Error(`Invalid deploy config file: excludes must be an array`);
-        }
+    }
+    const invalidReason = validateConfig(opt);
+    if (invalidReason) {
+        throw new Error(`Invalid deploy config: ${invalidReason}`);
     }
     const archiveName = __1.UID.sha256(opt.name.replaceAll(".", "_")) + ".tar.gz";
     console.log("Changing Config to live");
@@ -173,35 +253,12 @@ async function Deploy(opt) {
         headersTimeout: 5 * 60 * 1000,
         bodyTimeout: 5 * 60 * 1000,
     });
-    const abortController = new AbortController();
-    const abortTimer = setTimeout(() => abortController.abort(), 5 * 60 * 1000);
-    let uploadResponse;
-    try {
-        const res = await fetch(opt.host, {
-            method: "POST",
-            headers: { authorization: `Bearer ${authToken}` },
-            body: formData,
-            signal: abortController.signal,
-            ...{ dispatcher: uploadAgent },
-        });
-        const rawText = await res.text();
-        let parsed;
-        try {
-            parsed = rawText.length > 0 ? JSON.parse(rawText) : null;
-        }
-        catch {
-            parsed = rawText;
-        }
-        uploadResponse = res.ok
-            ? { ok: true, status: res.status, data: parsed }
-            : { ok: false, status: res.status, error: parsed };
-    }
-    catch (err) {
-        uploadResponse = { ok: false, error: err };
-    }
-    finally {
-        clearTimeout(abortTimer);
-    }
+    const uploadResponse = await __1.Http.post(opt.host, formData, {
+        headers: { authorization: `Bearer ${authToken}` },
+        dispatcher: uploadAgent,
+        timeoutMs: 5 * 60 * 1000,
+        retry: { enabled: false },
+    });
     const elapsedMs = Date.now() - startedAt;
     const useColor = process.stdout.isTTY && !process.env.NO_COLOR;
     const c = (code, t) => useColor ? `\x1b[${code}m${t}\x1b[0m` : t;
@@ -281,18 +338,23 @@ async function Deploy(opt) {
     console.log(`  ${dim("elapsed: ")} ${elapsedMs}ms`);
     console.log(`  ${dim("time:    ")} ${stamp}`);
     const info = body?.data?.data;
-    if (info && typeof info === "object" && info.bluegreen === true) {
-        const slotBadge = info.activeThisDeploy
-            ? green("← active in production")
-            : yellow("(inactive — deploy landed but nginx still points at " + info.active + "; run /pckg/switch to promote)");
-        console.log(`  ${dim("mode:    ")} blue-green`);
-        console.log(`  ${dim("slot:    ")} ${bold(String(info.slot))} ${slotBadge}`);
-        if (info.active && info.active !== info.slot) {
-            console.log(`  ${dim("active:  ")} ${info.active}`);
+    if (info && typeof info === "object" && "ok" in info) {
+        if (info.project && info.project !== opt.name) {
+            console.log(`  ${dim("server project:")} ${info.project}`);
+        }
+        if (info.bluegreen === true) {
+            const slotBadge = info.activeThisDeploy
+                ? green("← active in production")
+                : yellow("(inactive — deploy landed but nginx still points at " + info.active + "; run /pckg/switch to promote)");
+            console.log(`  ${dim("mode:    ")} blue-green`);
+            console.log(`  ${dim("slot:    ")} ${bold(String(info.slot))} ${slotBadge}`);
+            if (info.active && info.active !== info.slot) {
+                console.log(`  ${dim("active:  ")} ${info.active}`);
+            }
+        }
+        else if (info.bluegreen === false) {
+            console.log(`  ${dim("mode:    ")} single-instance ${green("← active")}`);
         }
-    }
-    else if (info && typeof info === "object" && info.bluegreen === false) {
-        console.log(`  ${dim("mode:    ")} single-instance`);
     }
     if (!emptyResponse) {
         const payload = JSON.stringify(body);

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

@@ -119,6 +119,7 @@ export declare class DeployerService extends BaseService {
     }>;
     tokensMatch(a: string | undefined, b: string | undefined): boolean;
     private _checkUserAuth;
+    private static _extractPort;
     private _renderNginx;
     runPM2(found: IConfig, projectState?: IProjectState | null): Promise<IError | null>;
     private static readonly SKIP_DIRS;

package/dist/apiServer/deployment/DeployerService.js

@@ -246,7 +246,7 @@ class DeployerService extends BaseService_1.BaseService {
             }
             if (found.nginx?.config_dir && (!projectState || projectStateWasCreated)) {
                 const activeCfg = (found.config ?? {});
-                const nginxErr = await this._renderNginx(found, data.name, activeCfg.PORT ?? "");
+                const nginxErr = await this._renderNginx(found, data.name, DeployerService._extractPort(activeCfg));
                 if (nginxErr) {
                     if (found.email && found.email.length > 0) {
                         for (let email of found.email) {
@@ -366,7 +366,7 @@ class DeployerService extends BaseService_1.BaseService {
             if (found.nginx?.config_dir) {
                 const slotCfg = target === "blue" ? found.bluegreen.blue_config : found.bluegreen.green_config;
                 const merged = { ...(found.config ?? {}), ...(slotCfg ?? {}) };
-                const nginxErr = await this._renderNginx(found, data.name, merged.PORT ?? "");
+                const nginxErr = await this._renderNginx(found, data.name, DeployerService._extractPort(merged));
                 if (nginxErr) {
                     (0, LogService_1.logError)("nginx render during switch failed (state already flipped): " + nginxErr.message);
                     hookError = nginxErr.message;
@@ -441,11 +441,23 @@ class DeployerService extends BaseService_1.BaseService {
         }
         return matched;
     }
+    static _extractPort(config) {
+        if (!config || typeof config !== "object")
+            return "";
+        for (const key of Object.keys(config)) {
+            if (key.toLowerCase() === "port") {
+                const v = config[key];
+                if (v !== null && v !== undefined && String(v).length > 0)
+                    return String(v);
+            }
+        }
+        return "";
+    }
     async _renderNginx(found, projectName, activePort) {
         if (!found.nginx?.config_dir)
             return null;
         if (!activePort) {
-            return { code: 52, message: "Cannot render nginx: no PORT in merged config for project " + projectName, httpStatus: 500 };
+            return { code: 52, message: "Cannot render nginx: no port found in config for project " + projectName + " (expected a 'port' key in config or blue_config/green_config)", httpStatus: 500 };
         }
         const dir = found.nginx.config_dir;
         try {

package/dist/apiServer/http/Http.js

@@ -43,6 +43,32 @@ function normalizeHeaders(headers) {
 function isRetryableStatus(status, retryOnStatuses) {
     return retryOnStatuses.includes(status);
 }
+function isFormDataLike(value) {
+    return (value !== null &&
+        typeof value === "object" &&
+        Object.prototype.toString.call(value) === "[object FormData]" &&
+        typeof value.entries === "function");
+}
+function normalizeFormData(source) {
+    if (source instanceof undici_1.FormData)
+        return source;
+    const target = new undici_1.FormData();
+    for (const [name, value] of source.entries()) {
+        if (typeof value === "string") {
+            target.append(name, value);
+        }
+        else {
+            target.append(name, value, value.name);
+        }
+    }
+    return target;
+}
+function removeContentTypeHeader(headers) {
+    for (const key of Object.keys(headers)) {
+        if (key.toLowerCase() === "content-type")
+            delete headers[key];
+    }
+}
 function isLikelyNetworkError(err) {
     if (!err || typeof err !== "object")
         return false;
@@ -423,11 +449,12 @@ class Http {
         let body = undefined;
         const hasBody = opts.body !== undefined && opts.body !== null;
         const allowBody = opts.allowBody ?? (opts.method !== "GET" && opts.method !== "DELETE");
+        let isMultipart = false;
         if (hasBody && allowBody) {
-            if (typeof FormData !== "undefined" && opts.body instanceof FormData) {
-                body = opts.body;
-                delete headers["content-type"];
-                delete headers["Content-Type"];
+            if (isFormDataLike(opts.body)) {
+                isMultipart = true;
+                body = normalizeFormData(opts.body);
+                removeContentTypeHeader(headers);
             }
             else {
                 const ct = (headers["content-type"] || headers["Content-Type"] || "").toLowerCase();
@@ -442,6 +469,9 @@ class Http {
                 }
             }
         }
+        if (isMultipart && retryCfg.maxAttempts !== 1) {
+            retryCfg.maxAttempts = 1;
+        }
         const responseType = opts.responseType ?? "json";
         const throwOnJsonParseError = opts.throwOnJsonParseError ?? false;
         let attemptsMade = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "badmfck-api-server",
-  "version": "4.1.47",
+  "version": "4.1.51",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",