badmfck-api-server 4.1.37 → 4.1.39

package/dist/apiServer/APIService.js

@@ -249,10 +249,11 @@ class APIService extends BaseService_1.BaseService {
             origin: (origin, callback) => {
                 if (!origin)
                     return callback(null, true);
+                if (this.noCors)
+                    return callback(null, true);
                 try {
                     const o = new URL(String(origin));
                     const originNorm = o.origin.replace(/\/$/, "");
-                    const hostNorm = o.host.replace(/\/$/, "");
                     const ok = corsSet.has(originNorm);
                     return callback(null, ok);
                 }

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

@@ -0,0 +1,10 @@
+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>;
+export {};

package/dist/apiServer/deployment/Activate.js

@@ -0,0 +1,137 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": 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("../..");
+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}`);
+        }
+    }
+    if (scheme && scheme !== "blue" && scheme !== "green") {
+        throw new Error(`Invalid scheme: ${scheme}. Must be "blue" or "green" (or omitted).`);
+    }
+    let switchUrl;
+    if (opt.switch_host) {
+        switchUrl = opt.switch_host;
+    }
+    else if (/\/add\/?$/.test(opt.host)) {
+        switchUrl = opt.host.replace(/\/add\/?$/, "/switch");
+    }
+    else {
+        throw new Error(`Cannot derive switch URL from host "${opt.host}". ` +
+            `Either add "switch_host" to config, or make sure "host" ends with /add.`);
+    }
+    const authToken = crypto_1.default.createHash("sha256").update(opt.username + ":" + opt.password).digest("hex");
+    const requestBody = { name: opt.name, token: opt.token };
+    if (scheme)
+        requestBody.scheme = scheme;
+    console.log(`Activating${scheme ? ` slot=${scheme}` : " (auto: lastDeployed)"} for ${opt.name} at ${switchUrl}`);
+    const startedAt = Date.now();
+    const response = await __1.Http.post(switchUrl, requestBody, {
+        headers: { authorization: `Bearer ${authToken}` },
+        timeoutMs: 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;
+    const red = (t) => c("31", t);
+    const green = (t) => c("32", t);
+    const yellow = (t) => c("33", t);
+    const dim = (t) => c("2", t);
+    const bold = (t) => c("1", t);
+    const line = dim("─".repeat(60));
+    const now = new Date();
+    const pad = (n) => String(n).padStart(2, "0");
+    const stamp = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`;
+    console.log("");
+    if (!response.ok) {
+        const statusStr = response.status !== undefined
+            ? `HTTP ${response.status}`
+            : "network error (no response)";
+        console.error(red(bold("✗ ACTIVATE FAILED — transport error")));
+        console.error(line);
+        console.error(`  ${dim("host:    ")} ${switchUrl}`);
+        console.error(`  ${dim("status:  ")} ${statusStr}`);
+        console.error(`  ${dim("elapsed: ")} ${elapsedMs}ms`);
+        if (response.error !== undefined) {
+            const errText = typeof response.error === "string"
+                ? response.error
+                : JSON.stringify(response.error);
+            const clipped = errText.length > 400 ? errText.slice(0, 400) + `... (${errText.length} total)` : errText;
+            console.error(`  ${dim("error:   ")} ${clipped}`);
+        }
+        console.error(line);
+        process.exit(1);
+    }
+    const body = response.data;
+    let appError = null;
+    if (body && typeof body === "object") {
+        if (__1.ErrorUtils.isError(body?.error))
+            appError = body.error;
+        else if (__1.ErrorUtils.isError(body?.data?.error))
+            appError = body.data.error;
+        else if (__1.ErrorUtils.isError(body?.data))
+            appError = body.data;
+        else if (__1.ErrorUtils.isError(body))
+            appError = body;
+    }
+    if (appError) {
+        console.error(red(bold("✗ ACTIVATE REJECTED BY SERVER")));
+        console.error(line);
+        console.error(`  ${dim("host:     ")} ${switchUrl}`);
+        console.error(`  ${dim("code:     ")} ${appError.code}`);
+        console.error(`  ${dim("message:  ")} ${appError.message}`);
+        if (appError.httpStatus)
+            console.error(`  ${dim("httpCode: ")} ${appError.httpStatus}`);
+        if (appError.details !== undefined) {
+            const d = typeof appError.details === "string" ? appError.details : JSON.stringify(appError.details);
+            const clipped = d.length > 400 ? d.slice(0, 400) + `... (${d.length} total)` : d;
+            console.error(`  ${dim("details:  ")} ${clipped}`);
+        }
+        console.error(`  ${dim("elapsed:  ")} ${elapsedMs}ms`);
+        console.error(line);
+        process.exit(1);
+    }
+    const info = body?.data ?? {};
+    const action = info.action ?? "switch";
+    const active = info.active ?? "?";
+    const previous = info.previousActive ?? "?";
+    const hookError = info.hookError ?? null;
+    if (hookError) {
+        console.log(yellow(bold("⚠ SLOT FLIPPED BUT nginx RELOAD FAILED")));
+    }
+    else if (action === "rollback") {
+        console.log(green(bold("✓ ROLLBACK SUCCESSFUL")));
+    }
+    else {
+        console.log(green(bold("✓ ACTIVATE SUCCESSFUL")));
+    }
+    console.log(line);
+    console.log(`  ${dim("project:  ")} ${opt.name}`);
+    console.log(`  ${dim("action:   ")} ${action}`);
+    console.log(`  ${dim("active:   ")} ${previous} ${dim("→")} ${bold(active)}`);
+    console.log(`  ${dim("host:     ")} ${switchUrl}`);
+    console.log(`  ${dim("status:   ")} HTTP ${response.status}`);
+    console.log(`  ${dim("elapsed:  ")} ${elapsedMs}ms`);
+    console.log(`  ${dim("time:     ")} ${stamp}`);
+    if (hookError) {
+        console.log(`  ${dim("hookErr:  ")} ${yellow(hookError)}`);
+        console.log(dim(`  (state + symlink already committed; retry the reload manually: nginx -s reload)`));
+    }
+    console.log(line);
+    console.log("");
+    return active;
+}
+exports.Activate = Activate;

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

@@ -49,10 +49,12 @@ declare const _TConfig: {
     };
     readonly $__bluegreen_optional: true;
     readonly nginx: {
-        readonly config: "";
-        readonly $__config_optional: true;
-        readonly symlink: "";
-        readonly $__symlink_optional: true;
+        readonly config_dir: "";
+        readonly $__config_dir_optional: true;
+        readonly domain: "";
+        readonly $__domain_optional: true;
+        readonly upstream_name: "";
+        readonly $__upstream_name_optional: true;
     };
     readonly $__nginx_optional: true;
 };
@@ -69,8 +71,9 @@ export declare const REQ_DEPLOYMENT_CONFIG: Req<void, Map<string, {
         green_config: {};
     } | undefined;
     nginx?: {
-        config?: string | undefined;
-        symlink?: string | undefined;
+        config_dir?: string | undefined;
+        domain?: string | undefined;
+        upstream_name?: string | undefined;
     } | undefined;
     name: string;
     destination: string;
@@ -98,8 +101,9 @@ export declare const REQ_DEPLOYMENT_CONFIG_ADD: Req<{
         green_config: {};
     } | undefined;
     nginx?: {
-        config?: string | undefined;
-        symlink?: string | undefined;
+        config_dir?: string | undefined;
+        domain?: string | undefined;
+        upstream_name?: string | undefined;
     } | undefined;
     name: string;
     destination: string;
@@ -126,8 +130,9 @@ export declare const REQ_DEPLOYMENT_CONFIG_ADD: Req<{
         green_config: {};
     } | undefined;
     nginx?: {
-        config?: string | undefined;
-        symlink?: string | undefined;
+        config_dir?: string | undefined;
+        domain?: string | undefined;
+        upstream_name?: string | undefined;
     } | undefined;
     name: string;
     destination: string;

package/dist/apiServer/deployment/ConfigService.js

@@ -80,10 +80,12 @@ const _TConfig = {
     },
     $__bluegreen_optional: true,
     nginx: {
-        config: "",
-        $__config_optional: true,
-        symlink: "",
-        $__symlink_optional: true,
+        config_dir: "",
+        $__config_dir_optional: true,
+        domain: "",
+        $__domain_optional: true,
+        upstream_name: "",
+        $__upstream_name_optional: true,
     },
     $__nginx_optional: true,
 };

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

@@ -4,6 +4,8 @@ interface IDeployerParams {
     host: string;
     username: string;
     password: string;
+    includes?: string[];
+    excludes?: string[];
 }
 export declare function Deploy(opt: IDeployerParams | string): Promise<string>;
 export {};

package/dist/apiServer/deployment/Deploy.js

@@ -18,23 +18,44 @@ async function Deploy(opt) {
         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 archiveName = __1.UID.sha256(opt.name.replaceAll(".", "_")) + ".tar.gz";
     console.log("Changing Config to live");
     const config = path_1.default.resolve("src", "Config.ts");
     let configSrc = fs_1.default.readFileSync(config).toString("utf-8");
-    if (configSrc.indexOf("static scheme:Scheme = local;") !== -1) {
-        configSrc = configSrc.replace("static scheme:Scheme = local;", "static scheme:Scheme = live;");
-        fs_1.default.writeFileSync(config, configSrc);
+    const schemeRe = /(\bscheme\s*:\s*Scheme\s*=\s*)local\b/g;
+    let replaced = 0;
+    const updated = configSrc.replace(schemeRe, (_match, prefix) => {
+        replaced++;
+        return prefix + "live";
+    });
+    if (replaced > 0) {
+        fs_1.default.writeFileSync(config, updated);
+        console.log(`Config: switched to live (${replaced} occurrence${replaced === 1 ? "" : "s"})`);
+    }
+    else if (/\bscheme\s*:\s*Scheme\s*=\s*live\b/.test(configSrc)) {
+        console.log("Config already in live mode — nothing to change");
+    }
+    else {
+        console.warn("Config: no 'scheme: Scheme = local|live' pattern found in " + config +
+            " — check the file was not renamed/restructured");
     }
     const pkgPath = path_1.default.resolve("package.json");
     const pkg = JSON.parse(fs_1.default.readFileSync(pkgPath).toString("utf-8"));
-    const parts = String(pkg.version || "0.0.0").split(".").map(p => parseInt(p, 10) || 0);
+    const oldVersion = String(pkg.version || "0.0.0");
+    const pkgName = String(pkg.name || opt.name);
+    const parts = oldVersion.split(".").map(p => parseInt(p, 10) || 0);
     while (parts.length < 3)
         parts.push(0);
     parts[parts.length - 1] += 1;
     const newVersion = parts.join(".");
-    console.log(`Bumping version: ${pkg.version} -> ${newVersion}`);
+    console.log(`Bumping version: ${oldVersion} -> ${newVersion}`);
     pkg.version = newVersion;
     fs_1.default.writeFileSync(pkgPath, JSON.stringify(pkg, null, "\t") + "\n");
     if (fs_1.default.existsSync(path_1.default.resolve(archiveName))) {
@@ -44,26 +65,178 @@ async function Deploy(opt) {
     console.log("Build");
     var execResult = run("npm run build");
     console.log(execResult);
-    console.log("Archiving");
-    execResult = run("tar -czvf " + archiveName + " ./bin package.json");
-    console.log(execResult);
+    const items = ["./bin", "package.json"];
+    if (Array.isArray(opt.includes)) {
+        for (const inc of opt.includes) {
+            if (typeof inc !== "string" || inc.length === 0)
+                continue;
+            if (inc.startsWith("-")) {
+                console.warn(`Skipping include that starts with '-': ${inc}`);
+                continue;
+            }
+            if (!fs_1.default.existsSync(inc)) {
+                console.warn(`Include path does not exist (tar will error): ${inc}`);
+            }
+            items.push(inc);
+        }
+    }
+    const excludes = new Set();
+    const addExclude = (raw, source) => {
+        if (typeof raw !== "string")
+            return;
+        const trimmed = raw.trim();
+        if (trimmed.length === 0 || trimmed.startsWith("#"))
+            return;
+        if (trimmed.startsWith("-")) {
+            console.warn(`Skipping exclude starting with '-' from ${source}: ${trimmed}`);
+            return;
+        }
+        excludes.add(trimmed);
+    };
+    const ignoreFile = path_1.default.resolve(".deployignore");
+    if (fs_1.default.existsSync(ignoreFile)) {
+        const lines = fs_1.default.readFileSync(ignoreFile, "utf-8").split(/\r?\n/);
+        for (const line of lines)
+            addExclude(line, ".deployignore");
+    }
+    if (Array.isArray(opt.excludes)) {
+        for (const ex of opt.excludes)
+            addExclude(ex, "config.excludes");
+    }
+    const excludeArgs = Array.from(excludes).map(p => `--exclude=${p}`);
+    console.log("Archiving:", items.join(", "));
+    if (excludeArgs.length > 0)
+        console.log("Excluding:", Array.from(excludes).join(", "));
+    try {
+        (0, child_process_1.execFileSync)("tar", ["-czvf", archiveName, ...excludeArgs, ...items], { encoding: "utf-8", stdio: "inherit" });
+    }
+    catch (err) {
+        console.error(`\ntar failed while creating ${archiveName}\n`);
+        const out = (err.stdout || "").toString().trim();
+        const errOut = (err.stderr || "").toString().trim();
+        if (out)
+            console.error(out);
+        if (errOut)
+            console.error(errOut);
+        process.exit(typeof err.status === "number" ? err.status : 1);
+    }
     if (!fs_1.default.existsSync(path_1.default.resolve(archiveName))) {
         console.error("ARCHIVE NOT CREATED!");
         return "";
     }
-    const cmd = `curl \
-    -H "Authorization: Bearer ${crypto_1.default.createHash("sha256").update(opt.username + ":" + opt.password).digest("hex")}" \
-    -F "token=${opt.token}" \
-    -F "name=${opt.name}" \
-    -F "file=@${archiveName}" \
-    "${opt.host}"`;
-    console.log("Deploying: \n" + cmd);
-    execResult = run(cmd);
-    console.log(execResult);
+    const authToken = crypto_1.default.createHash("sha256").update(opt.username + ":" + opt.password).digest("hex");
+    const archivePath = path_1.default.resolve(archiveName);
+    const fileBlob = await fs_1.default.openAsBlob(archivePath);
+    const formData = new FormData();
+    formData.set("token", opt.token);
+    formData.set("name", opt.name);
+    formData.set("file", fileBlob, archiveName);
+    console.log(`Deploying to ${opt.host} (archive: ${archiveName})`);
+    const startedAt = Date.now();
+    const uploadResponse = await __1.Http.post(opt.host, formData, {
+        headers: { authorization: `Bearer ${authToken}` },
+        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;
+    const red = (t) => c("31", t);
+    const green = (t) => c("32", t);
+    const yellow = (t) => c("33", t);
+    const dim = (t) => c("2", t);
+    const bold = (t) => c("1", t);
+    const line = dim("─".repeat(60));
     const deployedAt = new Date();
     const pad = (n) => String(n).padStart(2, "0");
     const stamp = `${deployedAt.getFullYear()}-${pad(deployedAt.getMonth() + 1)}-${pad(deployedAt.getDate())} ${pad(deployedAt.getHours())}:${pad(deployedAt.getMinutes())}:${pad(deployedAt.getSeconds())}`;
-    console.log(`\nDeployed v${newVersion} at ${stamp}\n`);
+    console.log("");
+    if (!uploadResponse.ok) {
+        const statusStr = uploadResponse.status !== undefined
+            ? `HTTP ${uploadResponse.status}`
+            : "network error (no response)";
+        console.error(red(bold("✗ DEPLOY FAILED — transport error")));
+        console.error(line);
+        console.error(`  ${dim("host:    ")} ${opt.host}`);
+        console.error(`  ${dim("status:  ")} ${statusStr}`);
+        console.error(`  ${dim("elapsed: ")} ${elapsedMs}ms`);
+        if (uploadResponse.error !== undefined) {
+            const errText = typeof uploadResponse.error === "string"
+                ? uploadResponse.error
+                : JSON.stringify(uploadResponse.error);
+            const clipped = errText.length > 400 ? errText.slice(0, 400) + `... (${errText.length} total)` : errText;
+            console.error(`  ${dim("error:   ")} ${clipped}`);
+        }
+        console.error(line);
+        process.exit(1);
+    }
+    const body = uploadResponse.data;
+    let appError = null;
+    if (body && typeof body === "object") {
+        if (__1.ErrorUtils.isError(body?.error))
+            appError = body.error;
+        else if (__1.ErrorUtils.isError(body?.data?.error))
+            appError = body.data.error;
+        else if (__1.ErrorUtils.isError(body?.data))
+            appError = body.data;
+        else if (__1.ErrorUtils.isError(body))
+            appError = body;
+    }
+    if (appError) {
+        console.error(red(bold("✗ DEPLOY REJECTED BY SERVER")));
+        console.error(line);
+        console.error(`  ${dim("host:     ")} ${opt.host}`);
+        console.error(`  ${dim("code:     ")} ${appError.code}`);
+        console.error(`  ${dim("message:  ")} ${appError.message}`);
+        if (appError.httpStatus)
+            console.error(`  ${dim("httpCode: ")} ${appError.httpStatus}`);
+        if (appError.details !== undefined) {
+            const d = typeof appError.details === "string" ? appError.details : JSON.stringify(appError.details);
+            const clipped = d.length > 400 ? d.slice(0, 400) + `... (${d.length} total)` : d;
+            console.error(`  ${dim("details:  ")} ${clipped}`);
+        }
+        console.error(`  ${dim("elapsed:  ")} ${elapsedMs}ms`);
+        console.error(line);
+        process.exit(1);
+    }
+    const emptyResponse = body === null || body === undefined
+        || (typeof body === "object" && Object.keys(body).length === 0);
+    if (emptyResponse) {
+        console.log(yellow(bold("⚠ DEPLOY LIKELY OK (server returned empty response)")));
+    }
+    else {
+        console.log(green(bold("✓ DEPLOY SUCCESSFUL")));
+    }
+    console.log(line);
+    console.log(`  ${dim("project: ")} ${opt.name}`);
+    console.log(`  ${dim("package: ")} ${pkgName}`);
+    console.log(`  ${dim("version: ")} ${oldVersion} ${dim("→")} ${bold(newVersion)}`);
+    console.log(`  ${dim("archive: ")} ${archiveName}`);
+    console.log(`  ${dim("host:    ")} ${opt.host}`);
+    console.log(`  ${dim("status:  ")} HTTP ${uploadResponse.status}`);
+    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}`);
+        }
+    }
+    else if (info && typeof info === "object" && info.bluegreen === false) {
+        console.log(`  ${dim("mode:    ")} single-instance`);
+    }
+    if (!emptyResponse) {
+        const payload = JSON.stringify(body);
+        const clipped = payload.length > 300 ? payload.slice(0, 300) + `... (${payload.length} total)` : payload;
+        console.log(`  ${dim("response:")} ${clipped}`);
+    }
+    console.log(line);
+    console.log("");
     return archiveName;
 }
 exports.Deploy = Deploy;

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

@@ -46,8 +46,13 @@ export declare class DeployerService extends BaseService {
     setup: TDeployerSetup | null;
     notifier: IDeploymentNotifier | null;
     busy: Map<string, boolean>;
+    private _setupWatchDebounceTimer;
+    private _lastSetupHash;
     constructor(options: IDeployerServiceOptions);
     init(): Promise<void>;
+    private _loadSetup;
+    private _reloadSetup;
+    private _watchSetup;
     proceed(data: {
         auth?: string;
         name: string;
@@ -63,7 +68,14 @@ export declare class DeployerService extends BaseService {
         };
         data?: undefined;
     } | {
-        data: boolean;
+        data: {
+            ok: boolean;
+            project: string;
+            bluegreen: boolean;
+            slot: "blue" | "green" | null;
+            active: "blue" | "green" | null;
+            activeThisDeploy: boolean;
+        };
         error?: undefined;
     }>;
     switchSlot(data: {
@@ -107,6 +119,7 @@ export declare class DeployerService extends BaseService {
     }>;
     tokensMatch(a: string | undefined, b: string | undefined): boolean;
     private _checkUserAuth;
+    private _renderNginx;
     runPM2(found: IConfig, projectState?: IProjectState | null): Promise<IError | null>;
     private static readonly SKIP_DIRS;
     private static readonly TEMPLATE_EXTENSIONS;

package/dist/apiServer/deployment/DeployerService.js

@@ -37,6 +37,8 @@ class DeployerService extends BaseService_1.BaseService {
     setup = null;
     notifier = null;
     busy = new Map();
+    _setupWatchDebounceTimer = null;
+    _lastSetupHash = null;
     constructor(options) {
         super("DeployerService");
         this.options = options;
@@ -45,41 +47,84 @@ class DeployerService extends BaseService_1.BaseService {
         super.init();
         const cs = new ConfigService_1.ConfigService(this.options.projects_path);
         await cs.init();
+        const initial = await this._loadSetup();
+        if (!initial) {
+            throw new Error("Setup file missing/invalid at start — cannot start deployer");
+        }
+        this.setup = initial;
+        this._lastSetupHash = crypto_1.default.createHash("md5").update(JSON.stringify(initial)).digest("hex");
+        if (this.setup.notifier?.URL && this.setup.notifier?.KEY) {
+            this.notifier = new Notifier_1.Notifier({ URL: this.setup.notifier.URL, KEY: this.setup.notifier.KEY });
+            await this.notifier.init();
+        }
+        if (this.setup.watchdog) {
+            const wd = new Watchdog_1.Watchdog(this.notifier);
+            await wd.init();
+        }
+        this._watchSetup();
+        exports.REQ_DEPLOYMENT_PROCEED.listener = async (data) => this.proceed(data);
+        exports.REQ_DEPLOYMENT_SWITCH.listener = async (data) => this.switchSlot(data);
+        exports.REQ_DEPLOYMENT_STATUS.listener = async (data) => this.status(data);
+    }
+    async _loadSetup() {
         const setupFile = path_1.default.resolve(this.options.setup_path, "setup.json");
         if (!fs_1.default.existsSync(setupFile)) {
             (0, LogService_1.logError)("Setup file not found: " + setupFile);
-            throw new Error("Setup file not found: " + setupFile);
+            return null;
         }
+        let raw;
         try {
-            this.setup = JSON.parse(fs_1.default.readFileSync(setupFile, "utf-8"));
+            raw = fs_1.default.readFileSync(setupFile, "utf-8");
         }
         catch (e) {
             (0, LogService_1.logError)("Failed to read setup file: " + e.message);
-            throw new Error("Failed to read setup file: " + e.message);
+            return null;
         }
-        const validation = await __1.Validator.validateStructure(_TSetup, this.setup);
-        if (validation && validation.length > 0) {
-            (0, LogService_1.logError)("Setup file validation failed: " + JSON.stringify(validation));
-            throw new Error("Setup file validation failed: " + JSON.stringify(validation));
+        let parsed;
+        try {
+            parsed = JSON.parse(raw);
         }
-        if (!this.setup) {
-            (0, LogService_1.logError)("Setup file is empty or invalid: " + setupFile);
-            throw new Error("Setup file is empty or invalid: " + setupFile);
+        catch (e) {
+            (0, LogService_1.logError)("Failed to parse setup.json: " + e.message);
+            return null;
         }
-        let notifier = null;
-        if (this.setup && this.setup.notifier) {
-            if (this.setup.notifier.URL && this.setup.notifier.KEY) {
-                notifier = new Notifier_1.Notifier({ URL: this.setup.notifier.URL, KEY: this.setup.notifier.KEY });
-                await notifier.init();
-            }
+        const errors = await __1.Validator.validateStructure(_TSetup, parsed);
+        if (errors && errors.length > 0) {
+            (0, LogService_1.logError)("Setup validation failed: " + JSON.stringify(errors));
+            return null;
         }
-        if (this.setup && this.setup.watchdog) {
-            const wd = new Watchdog_1.Watchdog(notifier);
-            await wd.init();
+        return parsed;
+    }
+    async _reloadSetup() {
+        const fresh = await this._loadSetup();
+        if (!fresh) {
+            (0, LogService_1.logWarn)("Setup reload failed — keeping previous good setup in memory");
+            return;
         }
-        exports.REQ_DEPLOYMENT_PROCEED.listener = async (data) => this.proceed(data);
-        exports.REQ_DEPLOYMENT_SWITCH.listener = async (data) => this.switchSlot(data);
-        exports.REQ_DEPLOYMENT_STATUS.listener = async (data) => this.status(data);
+        const hash = crypto_1.default.createHash("md5").update(JSON.stringify(fresh)).digest("hex");
+        if (hash === this._lastSetupHash)
+            return;
+        this._lastSetupHash = hash;
+        this.setup = fresh;
+        (0, LogService_1.logWarn)("Setup reloaded from disk (users list refreshed live; notifier/watchdog need service restart to change)");
+    }
+    _watchSetup() {
+        try {
+            fs_1.default.watch(this.options.setup_path, (_eventType, filename) => {
+                if (filename !== "setup.json")
+                    return;
+                if (this._setupWatchDebounceTimer)
+                    clearTimeout(this._setupWatchDebounceTimer);
+                this._setupWatchDebounceTimer = setTimeout(() => {
+                    this._setupWatchDebounceTimer = null;
+                    this._reloadSetup();
+                }, 200);
+            });
+        }
+        catch (e) {
+            (0, LogService_1.logError)("Failed to fs.watch setup file: " + e.message);
+        }
+        setInterval(() => { this._reloadSetup(); }, 60_000).unref();
     }
     async proceed(data) {
         const user = this._checkUserAuth(data.auth);
@@ -109,6 +154,7 @@ class DeployerService extends BaseService_1.BaseService {
             const safeName = (path_1.default.basename(file.name || "").replace(/[^a-zA-Z0-9._-]/g, "_")) || "upload";
             let projectState = null;
             let projectStatePath = null;
+            let projectStateWasCreated = false;
             if (found.bluegreen && found.bluegreen.blue_config && found.bluegreen.green_config) {
                 projectStatePath = path_1.default.resolve(this.options.projects_path, data.name + "_state_.json");
                 if (fs_1.default.existsSync(projectStatePath)) {
@@ -125,6 +171,7 @@ class DeployerService extends BaseService_1.BaseService {
                         lastDeployed: "blue",
                         history: []
                     };
+                    projectStateWasCreated = true;
                 }
                 else {
                     projectState.lastDeployed = projectState.active === "blue" ? "green" : "blue";
@@ -186,37 +233,31 @@ class DeployerService extends BaseService_1.BaseService {
             if (found.config) {
                 await this.applyConfig(found.destination, found.config);
             }
-            if (found.nginx?.config) {
-                const nginxPath = path_1.default.resolve(found.destination, found.nginx.config);
-                if (!fs_1.default.existsSync(nginxPath)) {
-                    if (found.email && found.email.length > 0) {
-                        for (let email of found.email) {
-                            this.notifier?.notifyEmailStatus(email, "error-nginx-missing", found.name, user.login);
-                        }
-                    }
-                    throw { code: 22, message: "nginx config declared but file not found: " + nginxPath, httpStatus: 500 };
-                }
-                try {
-                    NginxHelper_1.NginxHelper.applyTemplate(nginxPath, found.config ?? {});
-                }
-                catch (e) {
+            if (found.pm2) {
+                const pm2Result = await this.runPM2(found, projectState);
+                if (__1.ErrorUtils.isError(pm2Result)) {
                     if (found.email && found.email.length > 0) {
                         for (let email of found.email) {
-                            this.notifier?.notifyEmailStatus(email, "error-nginx-render", found.name, user.login);
+                            this.notifier?.notifyEmailStatus(email, "error-pm2", found.name, user.login);
                         }
                     }
-                    throw { code: 23, message: "nginx template render failed: " + String(e?.message ?? e), httpStatus: 500 };
+                    throw pm2Result;
                 }
             }
-            if (found.pm2) {
-                const pm2Result = await this.runPM2(found, projectState);
-                if (__1.ErrorUtils.isError(pm2Result)) {
+            if (found.nginx?.config_dir && (!projectState || projectStateWasCreated)) {
+                const activeCfg = (found.config ?? {});
+                const nginxErr = await this._renderNginx(found, data.name, activeCfg.PORT ?? "");
+                if (nginxErr) {
                     if (found.email && found.email.length > 0) {
                         for (let email of found.email) {
-                            this.notifier?.notifyEmailStatus(email, "error-pm2", found.name, user.login);
+                            this.notifier?.notifyEmailStatus(email, "error-nginx", found.name, user.login);
                         }
                     }
-                    throw pm2Result;
+                    throw nginxErr;
+                }
+                const hookErr = await NginxHelper_1.NginxHelper.runHook(found.bluegreen?.on_switch);
+                if (hookErr) {
+                    (0, LogService_1.logWarn)("nginx reload after initial deploy failed: " + hookErr);
                 }
             }
             if (projectState && projectStatePath) {
@@ -249,7 +290,16 @@ class DeployerService extends BaseService_1.BaseService {
                     }
                 }, 5000);
             }
-            return { data: true };
+            return { data: {
+                    ok: true,
+                    project: realName,
+                    bluegreen: !!projectState,
+                    slot: projectState?.lastDeployed ?? null,
+                    active: projectState?.active ?? null,
+                    activeThisDeploy: projectState
+                        ? projectState.active === projectState.lastDeployed
+                        : true,
+                } };
         }
         finally {
             this.busy.set(realName, false);
@@ -313,14 +363,18 @@ class DeployerService extends BaseService_1.BaseService {
             fs_1.default.writeFileSync(tmp, JSON.stringify(projectState, null, 4), "utf-8");
             fs_1.default.renameSync(tmp, projectStatePath);
             let hookError = null;
-            if (found.nginx?.config && found.nginx?.symlink) {
-                const symlinkTarget = path_1.default.resolve(found.destination, target, found.nginx.config);
-                const swapErr = NginxHelper_1.NginxHelper.swapSymlink(found.nginx.symlink, symlinkTarget);
-                if (swapErr) {
-                    return { error: swapErr };
+            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 ?? "");
+                if (nginxErr) {
+                    (0, LogService_1.logError)("nginx render during switch failed (state already flipped): " + nginxErr.message);
+                    hookError = nginxErr.message;
                 }
             }
-            hookError = await NginxHelper_1.NginxHelper.runHook(found.bluegreen.on_switch);
+            if (!hookError) {
+                hookError = await NginxHelper_1.NginxHelper.runHook(found.bluegreen.on_switch);
+            }
             const status = hookError ? "switch-hook-failed" : action === "rollback" ? `rolled-back-to-${target}` : `switched-to-${target}`;
             if (found.email && found.email.length > 0) {
                 for (const email of found.email) {
@@ -387,6 +441,43 @@ class DeployerService extends BaseService_1.BaseService {
         }
         return matched;
     }
+    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 };
+        }
+        const dir = found.nginx.config_dir;
+        try {
+            fs_1.default.mkdirSync(dir, { recursive: true });
+        }
+        catch (e) {
+            return { code: 50, message: "Cannot create nginx config_dir: " + String(e?.message ?? e), httpStatus: 500 };
+        }
+        const safeName = projectName.replace(/[^a-zA-Z0-9_]/g, "_");
+        const upstreamName = found.nginx.upstream_name || (safeName + "_backend");
+        const upstreamPath = path_1.default.resolve(dir, projectName + ".upstream.conf");
+        const serverPath = path_1.default.resolve(dir, projectName + ".server.conf");
+        const domain = found.nginx.domain || projectName;
+        if (!found.nginx.domain) {
+            (0, LogService_1.logWarn)("nginx.domain not set for project " + projectName +
+                " — seeding server.conf with server_name=" + projectName + " (edit or delete .server.conf to fix)");
+        }
+        const seedResult = NginxHelper_1.NginxHelper.seedServerConfig(serverPath, NginxHelper_1.DEFAULT_SERVER_TEMPLATE, {
+            DOMAIN: domain,
+            UPSTREAM: upstreamName,
+        });
+        if (seedResult.error)
+            return seedResult.error;
+        if (seedResult.seeded) {
+            (0, LogService_1.logWarn)("Seeded nginx server config for " + projectName + " at " + serverPath +
+                " — run `certbot --nginx -d " + domain + "` to add SSL");
+        }
+        const upstreamErr = NginxHelper_1.NginxHelper.writeUpstream(upstreamPath, upstreamName, activePort);
+        if (upstreamErr)
+            return upstreamErr;
+        return null;
+    }
     async runPM2(found, projectState) {
         let pm2attrs = projectState?.lastDeployed === "blue" ? found.bluegreen?.blue_pm2_attributes : found.bluegreen?.green_pm2_attributes;
         const pm2Attrs = Array.isArray(pm2attrs) ? pm2attrs.filter(s => typeof s === "string" && s.length > 0) : found.pm2_attributes;

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

@@ -1,9 +1,10 @@
+import { IError } from "../structures/Interfaces";
+export declare const DEFAULT_SERVER_TEMPLATE = "# Seeded by deployer for _{{DOMAIN}}_. SAFE TO EDIT.\n# Deployer NEVER overwrites this file after the initial seed.\n# Add SSL by running:  certbot --nginx -d _{{DOMAIN}}_\n\nserver {\n    server_name _{{DOMAIN}}_;\n    listen 80;\n\n    location / {\n        proxy_pass http://_{{UPSTREAM}}_;\n        proxy_http_version 1.1;\n        proxy_set_header Host $host;\n        proxy_set_header X-Real-IP $remote_addr;\n        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\n        proxy_set_header X-Forwarded-Proto $scheme;\n        proxy_read_timeout 60s;\n    }\n}\n";
 export declare class NginxHelper {
-    static applyTemplate(filePath: string, values: Record<string, string>): void;
-    static swapSymlink(symlinkPath: string, target: string): {
-        code: number;
-        message: string;
-        httpStatus: number;
-    } | null;
+    static writeUpstream(filePath: string, upstreamName: string, port: string): IError | null;
+    static seedServerConfig(filePath: string, template: string, values: Record<string, string>): {
+        seeded: boolean;
+        error?: IError;
+    };
     static runHook(cmd: string[] | undefined | null): Promise<string | null>;
 }

package/dist/apiServer/deployment/NginxHelper.js

@@ -3,50 +3,78 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NginxHelper = void 0;
+exports.NginxHelper = exports.DEFAULT_SERVER_TEMPLATE = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 const util_1 = require("util");
-const crypto_1 = __importDefault(require("crypto"));
 const LogService_1 = require("../LogService");
 const execFileAsync = (0, util_1.promisify)(child_process_1.execFile);
+exports.DEFAULT_SERVER_TEMPLATE = `# Seeded by deployer for _{{DOMAIN}}_. SAFE TO EDIT.
+# Deployer NEVER overwrites this file after the initial seed.
+# Add SSL by running:  certbot --nginx -d _{{DOMAIN}}_
+
+server {
+    server_name _{{DOMAIN}}_;
+    listen 80;
+
+    location / {
+        proxy_pass http://_{{UPSTREAM}}_;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_read_timeout 60s;
+    }
+}
+`;
 class NginxHelper {
-    static applyTemplate(filePath, values) {
-        if (!fs_1.default.existsSync(filePath))
-            throw new Error("nginx config file not found: " + filePath);
-        const original = fs_1.default.readFileSync(filePath, "utf-8");
-        const hashBefore = crypto_1.default.createHash("md5").update(original).digest("hex");
-        let content = original;
-        for (const [key, value] of Object.entries(values)) {
-            content = content.replaceAll(`_{{${key}}}_`, value);
-        }
-        const hashAfter = crypto_1.default.createHash("md5").update(content).digest("hex");
-        if (hashBefore !== hashAfter) {
-            fs_1.default.writeFileSync(filePath, content, "utf-8");
+    static writeUpstream(filePath, upstreamName, port) {
+        const content = `# Auto-generated by deployer on each activate — do not edit.
+upstream ${upstreamName} {
+    server 127.0.0.1:${port};
+}
+`;
+        try {
+            const tmp = filePath + ".tmp";
+            try {
+                fs_1.default.unlinkSync(tmp);
+            }
+            catch { }
+            fs_1.default.writeFileSync(tmp, content, "utf-8");
+            fs_1.default.renameSync(tmp, filePath);
+            return null;
         }
-        const leftover = content.match(/_\{\{[A-Za-z0-9_]+\}\}_/g);
-        if (leftover && leftover.length > 0) {
-            const unique = [...new Set(leftover)];
-            (0, LogService_1.logWarn)("Unresolved template placeholders in nginx config " + filePath + ": " + unique.join(", "));
+        catch (e) {
+            return { code: 48, message: "Failed to write nginx upstream file: " + String(e?.message ?? e), httpStatus: 500 };
         }
     }
-    static swapSymlink(symlinkPath, target) {
-        if (!fs_1.default.existsSync(target)) {
-            return { code: 48, message: "nginx symlink target missing: " + target, httpStatus: 500 };
+    static seedServerConfig(filePath, template, values) {
+        if (fs_1.default.existsSync(filePath)) {
+            return { seeded: false };
         }
         try {
-            const tmp = symlinkPath + ".tmp";
+            let content = template;
+            for (const [key, value] of Object.entries(values)) {
+                content = content.replaceAll(`_{{${key}}}_`, value);
+            }
+            const leftover = content.match(/_\{\{[A-Za-z0-9_]+\}\}_/g);
+            if (leftover && leftover.length > 0) {
+                const unique = [...new Set(leftover)];
+                (0, LogService_1.logWarn)("Unresolved placeholders in seeded nginx server config " + filePath + ": " + unique.join(", "));
+            }
+            const tmp = filePath + ".tmp";
             try {
                 fs_1.default.unlinkSync(tmp);
             }
             catch { }
-            fs_1.default.symlinkSync(target, tmp);
-            fs_1.default.renameSync(tmp, symlinkPath);
-            return null;
+            fs_1.default.writeFileSync(tmp, content, "utf-8");
+            fs_1.default.renameSync(tmp, filePath);
+            return { seeded: true };
         }
         catch (e) {
-            return { code: 49, message: "nginx symlink swap failed: " + String(e?.message ?? e), httpStatus: 500 };
+            return { seeded: false, error: { code: 49, message: "Failed to seed nginx server config: " + String(e?.message ?? e), httpStatus: 500 } };
         }
     }
     static async runHook(cmd) {

package/dist/apiServer/http/Http.js

@@ -424,15 +424,22 @@ class Http {
         const hasBody = opts.body !== undefined && opts.body !== null;
         const allowBody = opts.allowBody ?? (opts.method !== "GET" && opts.method !== "DELETE");
         if (hasBody && allowBody) {
-            const ct = (headers["content-type"] || headers["Content-Type"] || "").toLowerCase();
-            if (!ct)
-                headers["content-type"] = "application/json";
-            const ct2 = (headers["content-type"] || headers["Content-Type"] || "").toLowerCase();
-            if (ct2.includes("application/json") && typeof opts.body !== "string" && !(opts.body instanceof Buffer)) {
-                body = JSON.stringify(opts.body);
+            if (typeof FormData !== "undefined" && opts.body instanceof FormData) {
+                body = opts.body;
+                delete headers["content-type"];
+                delete headers["Content-Type"];
             }
             else {
-                body = opts.body;
+                const ct = (headers["content-type"] || headers["Content-Type"] || "").toLowerCase();
+                if (!ct)
+                    headers["content-type"] = "application/json";
+                const ct2 = (headers["content-type"] || headers["Content-Type"] || "").toLowerCase();
+                if (ct2.includes("application/json") && typeof opts.body !== "string" && !(opts.body instanceof Buffer)) {
+                    body = JSON.stringify(opts.body);
+                }
+                else {
+                    body = opts.body;
+                }
             }
         }
         const responseType = opts.responseType ?? "json";

package/dist/index.d.ts

@@ -17,4 +17,5 @@ import { Http } from "./apiServer/http/Http";
 import { MicroserviceHost } from "./apiServer/external/MicroserviceHost";
 import { MicroserviceClient } from "./apiServer/external/MicroserviceClient";
 import { Deploy } from "./apiServer/deployment/Deploy";
-export { MicroserviceHost, MicroserviceClient, Http, ZipUtils, UID, YYYYMMDDHH, JSONStableStringify, APIService, Initializer, LocalRequest, ValidationModel, MysqlService, TimeframeService, Validator, LogService, DataProvider, ErrorUtils, ExternalService, DBService, Deploy, S_MONITOR_REGISTRATE_ACTION };
+import { Activate } from "./apiServer/deployment/Activate";
+export { MicroserviceHost, MicroserviceClient, Http, ZipUtils, UID, YYYYMMDDHH, JSONStableStringify, APIService, Initializer, LocalRequest, ValidationModel, MysqlService, TimeframeService, Validator, LogService, DataProvider, ErrorUtils, ExternalService, DBService, Deploy, Activate, S_MONITOR_REGISTRATE_ACTION };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.S_MONITOR_REGISTRATE_ACTION = exports.Deploy = exports.DBService = exports.ExternalService = exports.ErrorUtils = exports.DataProvider = exports.LogService = exports.Validator = exports.TimeframeService = exports.MysqlService = exports.LocalRequest = exports.Initializer = exports.APIService = exports.JSONStableStringify = exports.YYYYMMDDHH = exports.UID = exports.ZipUtils = exports.Http = exports.MicroserviceClient = exports.MicroserviceHost = void 0;
+exports.S_MONITOR_REGISTRATE_ACTION = exports.Activate = exports.Deploy = exports.DBService = exports.ExternalService = exports.ErrorUtils = exports.DataProvider = exports.LogService = exports.Validator = exports.TimeframeService = exports.MysqlService = exports.LocalRequest = exports.Initializer = exports.APIService = exports.JSONStableStringify = exports.YYYYMMDDHH = exports.UID = exports.ZipUtils = exports.Http = exports.MicroserviceClient = exports.MicroserviceHost = void 0;
 const APIService_1 = require("./apiServer/APIService");
 Object.defineProperty(exports, "APIService", { enumerable: true, get: function () { return APIService_1.APIService; } });
 Object.defineProperty(exports, "Initializer", { enumerable: true, get: function () { return APIService_1.Initializer; } });
@@ -40,3 +40,5 @@ const MicroserviceClient_1 = require("./apiServer/external/MicroserviceClient");
 Object.defineProperty(exports, "MicroserviceClient", { enumerable: true, get: function () { return MicroserviceClient_1.MicroserviceClient; } });
 const Deploy_1 = require("./apiServer/deployment/Deploy");
 Object.defineProperty(exports, "Deploy", { enumerable: true, get: function () { return Deploy_1.Deploy; } });
+const Activate_1 = require("./apiServer/deployment/Activate");
+Object.defineProperty(exports, "Activate", { enumerable: true, get: function () { return Activate_1.Activate; } });

package/package.json

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