badmfck-api-server 4.1.29 → 4.1.31

package/dist/apiServer/APIService.js

@@ -146,14 +146,18 @@ class APIService extends BaseService_1.BaseService {
         this.options.endpoints.push(new Documentation_1.Documentation(this.options));
         this.options.endpoints.push(new ExternalServiceEndpoint_1.ExternalServiceEndpoint());
         this.options.endpoints.push(new MicroserviceHostController_1.MicroserviceHostController());
-        new DocumentService_1.DocumentGenerator(this.options.endpoints);
-        this.monitor = new MonitorService_1.MonitorService();
-        this.monitor.init();
-        if (this.options.deployer && this.options.deployer.users.length > 0) {
-            this.options.endpoints.push(new Deployer_1.Deployer());
+        if (this.options.deployer && this.options.deployer.projects_path && this.options.deployer.setup_path) {
             this.deployer = new DeployerService_1.DeployerService(this.options.deployer);
             this.deployer.init();
+            this.options.endpoints = [
+                new Deployer_1.Deployer(),
+                new Documentation_1.Documentation(this.options),
+                new Monitor_1.Monitor(this.options),
+            ];
         }
+        this.monitor = new MonitorService_1.MonitorService();
+        this.monitor.init();
+        new DocumentService_1.DocumentGenerator(this.options.endpoints);
         this.options.endpoints.push(new Liveness_1.Liveness(this.started), new Readiness_1.Readiness(this.started));
         exports.REQ_HTTP_REQUESTS_COUNT.listener = async () => this.requestsCount;
     }

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

@@ -48,7 +48,12 @@ declare const _TConfig: {
         readonly $__on_switch_optional: true;
     };
     readonly $__bluegreen_optional: true;
-    readonly nginx: {};
+    readonly nginx: {
+        readonly config: "";
+        readonly $__config_optional: true;
+        readonly symlink: "";
+        readonly $__symlink_optional: true;
+    };
     readonly $__nginx_optional: true;
 };
 export type IConfig = ValidationModel<typeof _TConfig>;
@@ -63,7 +68,10 @@ export declare const REQ_DEPLOYMENT_CONFIG: Req<void, Map<string, {
         blue_config: {};
         green_config: {};
     } | undefined;
-    nginx?: {} | undefined;
+    nginx?: {
+        config?: string | undefined;
+        symlink?: string | undefined;
+    } | undefined;
     name: string;
     destination: string;
     description: string;
@@ -89,7 +97,10 @@ export declare const REQ_DEPLOYMENT_CONFIG_ADD: Req<{
         blue_config: {};
         green_config: {};
     } | undefined;
-    nginx?: {} | undefined;
+    nginx?: {
+        config?: string | undefined;
+        symlink?: string | undefined;
+    } | undefined;
     name: string;
     destination: string;
     description: string;
@@ -114,7 +125,10 @@ export declare const REQ_DEPLOYMENT_CONFIG_ADD: Req<{
         blue_config: {};
         green_config: {};
     } | undefined;
-    nginx?: {} | undefined;
+    nginx?: {
+        config?: string | undefined;
+        symlink?: string | undefined;
+    } | undefined;
     name: string;
     destination: string;
     description: string;

package/dist/apiServer/deployment/ConfigService.js

@@ -79,7 +79,12 @@ const _TConfig = {
         $__on_switch_optional: true,
     },
     $__bluegreen_optional: true,
-    nginx: {},
+    nginx: {
+        config: "",
+        $__config_optional: true,
+        symlink: "",
+        $__symlink_optional: true,
+    },
     $__nginx_optional: true,
 };
 exports.REQ_DEPLOYMENT_CONFIG = new badmfck_signal_1.Req();

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

@@ -1,6 +1,7 @@
 import { BaseEndpoint } from "../BaseEndpoint";
 import { HTTPRequestVO, TransferPacketVO } from "../structures/Interfaces";
 export declare class Deployer extends BaseEndpoint {
+    ignoreInDocumentation: boolean;
     constructor();
     file(req: HTTPRequestVO): Promise<TransferPacketVO<any>>;
     switchSlot(req: HTTPRequestVO): Promise<TransferPacketVO<any>>;

package/dist/apiServer/deployment/Deployer.js

@@ -1,9 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deployer = void 0;
 const BaseEndpoint_1 = require("../BaseEndpoint");
+const DefaultErrors_1 = __importDefault(require("../structures/DefaultErrors"));
 const DeployerService_1 = require("./DeployerService");
 class Deployer extends BaseEndpoint_1.BaseEndpoint {
+    ignoreInDocumentation = true;
     constructor() {
         super("pckg");
         this.registerEndpoints([
@@ -41,7 +46,7 @@ class Deployer extends BaseEndpoint_1.BaseEndpoint {
     }
     async file(req) {
         if (!req.files)
-            return { error: { code: 10, message: "No files were uploaded.", httpStatus: 400 } };
+            throw { ...DefaultErrors_1.default.FILE_NOT_EXISTS, details: "No files were uploaded" };
         const result = await DeployerService_1.REQ_DEPLOYMENT_PROCEED.request({ ...req.data, files: req.files, auth: req.headers.authorization });
         return { data: result };
     }

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

@@ -1,19 +1,27 @@
 import { Req } from "badmfck-signal";
 import { BaseService } from "../BaseService";
-import { IDeployerUser } from "../APIService";
 import { IConfig, IProjectState } from "./ConfigService";
 import { UploadedFile } from "express-fileupload";
+import { ValidationModel } from "../..";
 import { IDeploymentNotifier } from "./Notifier";
 import { IError } from "../structures/Interfaces";
+declare const _TSetup: {
+    readonly users: readonly [{
+        readonly login: "";
+        readonly password: "";
+    }];
+    readonly watchdog: true;
+    readonly $__watchdog_optional: true;
+    readonly notifier: {
+        readonly URL: "";
+        readonly KEY: "";
+    };
+    readonly $__notifier_optional: true;
+};
+export type TDeployerSetup = ValidationModel<typeof _TSetup>;
 export interface IDeployerServiceOptions {
     projects_path: string;
-    users: IDeployerUser[];
-    watchdog?: boolean;
-    notifier?: {
-        URL?: string;
-        KEY?: string;
-        controller?: BaseService;
-    } | null;
+    setup_path: string;
 }
 export declare const REQ_DEPLOYMENT_PROCEED: Req<{
     auth: string;
@@ -35,6 +43,7 @@ export declare const REQ_DEPLOYMENT_STATUS: Req<{
 }, any>;
 export declare class DeployerService extends BaseService {
     options: IDeployerServiceOptions;
+    setup: TDeployerSetup | null;
     notifier: IDeploymentNotifier | null;
     busy: Map<string, boolean>;
     constructor(options: IDeployerServiceOptions);
@@ -107,3 +116,4 @@ export declare class DeployerService extends BaseService {
     unpack(destination: string, uploadedFile: string, install?: boolean, ignoreDirectoryClean?: boolean): Promise<IError | null>;
     upload(file: UploadedFile, uploadPath: string): Promise<IError | null>;
 }
+export {};

package/dist/apiServer/deployment/DeployerService.js

@@ -12,16 +12,29 @@ const LogService_1 = require("../LogService");
 const __1 = require("../..");
 const Notifier_1 = require("./Notifier");
 const child_process_1 = require("child_process");
-const util_1 = require("util");
 const fs_1 = __importDefault(require("fs"));
 const crypto_1 = __importDefault(require("crypto"));
 const Watchdog_1 = require("./Watchdog");
-const execFileAsync = (0, util_1.promisify)(child_process_1.execFile);
+const NginxHelper_1 = require("./NginxHelper");
+const _TSetup = {
+    users: [{
+            login: "",
+            password: ""
+        }],
+    watchdog: true,
+    $__watchdog_optional: true,
+    notifier: {
+        URL: "",
+        KEY: "",
+    },
+    $__notifier_optional: true
+};
 exports.REQ_DEPLOYMENT_PROCEED = new badmfck_signal_1.Req(undefined, "REQ_DEPLOYER_SERVICE");
 exports.REQ_DEPLOYMENT_SWITCH = new badmfck_signal_1.Req(undefined, "REQ_DEPLOYER_SWITCH");
 exports.REQ_DEPLOYMENT_STATUS = new badmfck_signal_1.Req(undefined, "REQ_DEPLOYER_STATUS");
 class DeployerService extends BaseService_1.BaseService {
     options;
+    setup = null;
     notifier = null;
     busy = new Map();
     constructor(options) {
@@ -32,20 +45,35 @@ class DeployerService extends BaseService_1.BaseService {
         super.init();
         const cs = new ConfigService_1.ConfigService(this.options.projects_path);
         await cs.init();
+        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);
+        }
+        try {
+            this.setup = JSON.parse(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);
+        }
+        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));
+        }
+        if (!this.setup) {
+            (0, LogService_1.logError)("Setup file is empty or invalid: " + setupFile);
+            throw new Error("Setup file is empty or invalid: " + setupFile);
+        }
         let notifier = null;
-        if (this.options.notifier) {
-            if (this.options.notifier.controller) {
-                notifier = this.options.notifier.controller;
-                notifier.init();
-            }
-            else {
-                if (this.options.notifier.URL && this.options.notifier.KEY) {
-                    notifier = new Notifier_1.Notifier({ URL: this.options.notifier.URL, KEY: this.options.notifier.KEY });
-                    await notifier.init();
-                }
+        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();
             }
         }
-        if (this.options.watchdog) {
+        if (this.setup && this.setup.watchdog) {
             const wd = new Watchdog_1.Watchdog(notifier);
             await wd.init();
         }
@@ -112,11 +140,12 @@ class DeployerService extends BaseService_1.BaseService {
                 fs_1.default.mkdirSync(deployPath, { recursive: true });
                 found.destination = deployPath;
                 if (projectState && found.bluegreen) {
+                    const baseConfig = found.config ?? {};
                     if (projectState.lastDeployed === "blue" && found.bluegreen.blue_config) {
-                        found.config = found.bluegreen.blue_config;
+                        found.config = { ...baseConfig, ...found.bluegreen.blue_config };
                     }
                     else if (projectState.lastDeployed === "green" && found.bluegreen.green_config) {
-                        found.config = found.bluegreen.green_config;
+                        found.config = { ...baseConfig, ...found.bluegreen.green_config };
                     }
                 }
                 found.name = data.name + "-" + projectState.lastDeployed;
@@ -157,6 +186,28 @@ 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.email && found.email.length > 0) {
+                        for (let email of found.email) {
+                            this.notifier?.notifyEmailStatus(email, "error-nginx-render", found.name, user.login);
+                        }
+                    }
+                    throw { code: 23, message: "nginx template render failed: " + String(e?.message ?? e), httpStatus: 500 };
+                }
+            }
             if (found.pm2) {
                 const pm2Result = await this.runPM2(found, projectState);
                 if (__1.ErrorUtils.isError(pm2Result)) {
@@ -262,31 +313,14 @@ 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;
-            const rawHook = found.bluegreen.on_switch;
-            if (Array.isArray(rawHook)) {
-                const cmd = rawHook.filter(s => typeof s === "string" && s.length > 0);
-                if (cmd.length > 0) {
-                    if (!path_1.default.isAbsolute(cmd[0])) {
-                        hookError = "on_switch command must be an absolute path, got: " + cmd[0];
-                        (0, LogService_1.logError)(hookError);
-                    }
-                    else {
-                        try {
-                            const result = await execFileAsync(cmd[0], cmd.slice(1), {
-                                timeout: 30_000,
-                                maxBuffer: 4 * 1024 * 1024,
-                                env: { PATH: process.env.PATH ?? "/usr/bin:/bin" },
-                            });
-                            if (result.stderr)
-                                (0, LogService_1.logWarn)("on_switch stderr:", result.stderr);
-                        }
-                        catch (e) {
-                            hookError = String(e?.stderr || e?.message || e);
-                            (0, LogService_1.logError)("on_switch hook failed:", hookError);
-                        }
-                    }
+            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 };
                 }
             }
+            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) {
@@ -338,13 +372,15 @@ class DeployerService extends BaseService_1.BaseService {
     _checkUserAuth(authHeader) {
         if (!authHeader)
             return null;
+        if (!this.setup)
+            return null;
         const token = authHeader.split(" ").pop() ?? "";
         if (!token)
             return null;
-        if (!this.options.users || this.options.users.length === 0)
+        if (!this.setup.users || this.setup.users.length === 0)
             return null;
         let matched = null;
-        for (const user of this.options.users) {
+        for (const user of this.setup.users) {
             const expected = crypto_1.default.createHash("sha256").update(user.login + ":" + user.password).digest("hex");
             if (this.tokensMatch(token, expected))
                 matched = user;

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

@@ -1,2 +1,9 @@
 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 runHook(cmd: string[] | undefined | null): Promise<string | null>;
 }

package/dist/apiServer/deployment/NginxHelper.js

@@ -1,37 +1,80 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NginxHelper = void 0;
-const default_conf = `
- server {
-        server_name  paypartner.eu www.paypartner.eu apgp.paypartner.eu;
-        root         /var/www/apgp.paypartner.eu;
-        index index.html;
-
-        location /api {
-            include /etc/nginx/proxy_common.conf;
-            proxy_set_header X-Branch paypartner;
-            #paysolo api, 8096 to paypartner api
-            # 8065 -new paysolo
-            # 8095 - old paysolo
-            proxy_pass http://127.0.0.1:8065; 
-        }
-
-
-        location / {
-            try_files $uri $uri/ /index.html;
-        }
-    
-        listen 443 ssl; # managed by Certbot
-        #ssl_certificate /etc/letsencrypt/live/apgp.paypartner.eu/fullchain.pem; # managed by Certbot
-        #ssl_certificate_key /etc/letsencrypt/live/apgp.paypartner.eu/privkey.pem; # managed by Certbot
-
-        ssl_certificate /etc/letsencrypt/live/paypartner.eu/fullchain.pem;
-        ssl_certificate_key /etc/letsencrypt/live/paypartner.eu/privkey.pem;
-
-        include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
-        ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-    }
-`;
+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);
 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");
+        }
+        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(", "));
+        }
+    }
+    static swapSymlink(symlinkPath, target) {
+        if (!fs_1.default.existsSync(target)) {
+            return { code: 48, message: "nginx symlink target missing: " + target, httpStatus: 500 };
+        }
+        try {
+            const tmp = symlinkPath + ".tmp";
+            try {
+                fs_1.default.unlinkSync(tmp);
+            }
+            catch { }
+            fs_1.default.symlinkSync(target, tmp);
+            fs_1.default.renameSync(tmp, symlinkPath);
+            return null;
+        }
+        catch (e) {
+            return { code: 49, message: "nginx symlink swap failed: " + String(e?.message ?? e), httpStatus: 500 };
+        }
+    }
+    static async runHook(cmd) {
+        if (!Array.isArray(cmd))
+            return null;
+        const filtered = cmd.filter(s => typeof s === "string" && s.length > 0);
+        if (filtered.length === 0)
+            return null;
+        if (!path_1.default.isAbsolute(filtered[0])) {
+            const err = "nginx hook command must be an absolute path, got: " + filtered[0];
+            (0, LogService_1.logError)(err);
+            return err;
+        }
+        try {
+            const result = await execFileAsync(filtered[0], filtered.slice(1), {
+                timeout: 30_000,
+                maxBuffer: 4 * 1024 * 1024,
+                env: { PATH: process.env.PATH ?? "/usr/bin:/bin" },
+            });
+            if (result.stderr)
+                (0, LogService_1.logWarn)("nginx hook stderr:", result.stderr);
+            return null;
+        }
+        catch (e) {
+            const err = String(e?.stderr || e?.message || e);
+            (0, LogService_1.logError)("nginx hook failed:", err);
+            return err;
+        }
+    }
 }
 exports.NginxHelper = NginxHelper;

package/package.json

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