badmfck-api-server 4.1.36 → 4.1.38

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/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/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;
@@ -107,6 +112,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) {
@@ -313,14 +354,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 +432,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/package.json

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