badmfck-api-server 5.0.5 → 5.0.6

package/dist/apiServer/deployment/Deploy.js

@@ -9,6 +9,7 @@ const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const __1 = require("../..");
 const crypto_1 = __importDefault(require("crypto"));
+const os_1 = __importDefault(require("os"));
 const undici_1 = require("undici");
 const resolveConfig_1 = require("./resolveConfig");
 async function Deploy(opt) {
@@ -74,21 +75,33 @@ async function Deploy(opt) {
         spaMode = true;
         console.log("No ./bin found — using entire ./dist contents as distribution");
     }
+    const staged = [];
     if (Array.isArray(opt.includes)) {
-        for (const inc of opt.includes) {
-            if (typeof inc !== "string" || inc.length === 0)
+        for (const raw of opt.includes) {
+            const inc = typeof raw === "string" ? { src: raw, dest: raw } : raw;
+            if (!inc || typeof inc.src !== "string" || inc.src.length === 0)
                 continue;
-            if (inc.startsWith("-")) {
-                console.warn(`Skipping include that starts with '-': ${inc}`);
+            const src = inc.src;
+            const dest = (inc.dest && inc.dest.length > 0 ? inc.dest : src).replace(/^\.\//, "");
+            if (src.startsWith("-") || dest.startsWith("-"))
+                throw new Error(`Include path must not start with '-': ${src} -> ${dest}`);
+            if (!fs_1.default.existsSync(src))
+                throw new Error(`Include source does not exist: ${src}`);
+            if (path_1.default.isAbsolute(dest) || dest.split(/[\\/]/).includes(".."))
+                throw new Error(`Include 'dest' must be a relative path inside the slot, without '..': ${dest}`);
+            if (dest === src.replace(/^\.\//, "")) {
+                items.push(src);
                 continue;
             }
-            if (!fs_1.default.existsSync(inc)) {
-                console.warn(`Include path does not exist (tar will error): ${inc}`);
-            }
-            items.push(inc);
+            staged.push({ src, dest });
         }
     }
-    if (items.length === 0 && !spaMode) {
+    for (const s of staged) {
+        const clash = items.some(i => i.replace(/^\.\//, "") === s.dest);
+        if (clash)
+            console.warn(`Include dest "${s.dest}" collides with an already-archived path — the later entry wins on extraction`);
+    }
+    if (items.length === 0 && !spaMode && staged.length === 0) {
         throw new Error("Nothing to archive (no ./bin, no ./dist/index.html, no valid includes)");
     }
     const excludes = new Set();
@@ -127,6 +140,17 @@ async function Deploy(opt) {
     else {
         tarArgs.push(...items);
     }
+    let stageDir = null;
+    if (staged.length > 0) {
+        stageDir = fs_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), "badmfck-deploy-"));
+        for (const { src, dest } of staged) {
+            const target = path_1.default.join(stageDir, dest);
+            fs_1.default.mkdirSync(path_1.default.dirname(target), { recursive: true });
+            fs_1.default.cpSync(path_1.default.resolve(src), target, { recursive: true });
+            console.log(`Include: ${src} -> ${dest}`);
+        }
+        tarArgs.push("-C", stageDir, ".");
+    }
     if (spaMode) {
         console.log("Archiving: contents of ./dist (recursively, at archive root)");
         if (items.length > 0)
@@ -154,6 +178,16 @@ async function Deploy(opt) {
             console.error(errOut);
         process.exit(typeof err.status === "number" ? err.status : 1);
     }
+    finally {
+        if (stageDir) {
+            try {
+                fs_1.default.rmSync(stageDir, { recursive: true, force: true });
+            }
+            catch (e) {
+                console.warn(`Could not remove staging dir ${stageDir}: ${e?.message ?? e}`);
+            }
+        }
+    }
     if (!fs_1.default.existsSync(path_1.default.resolve(archiveName))) {
         console.error("ARCHIVE NOT CREATED!");
         return "";

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

@@ -4,7 +4,10 @@ export interface IDeployerConfig {
     host: string;
     username: string;
     password: string;
-    includes?: string[];
+    includes?: (string | {
+        src: string;
+        dest?: string;
+    })[];
     excludes?: string[];
     switch_host?: string;
 }

package/dist/apiServer/deployment/resolveConfig.js

@@ -14,8 +14,20 @@ function validateConfig(cfg) {
         return "not an object";
     if (!cfg.name || !cfg.token || !cfg.host || !cfg.username || !cfg.password)
         return "missing one of: name, token, host, username, password";
-    if (cfg.includes && !Array.isArray(cfg.includes))
-        return "includes must be an array";
+    if (cfg.includes) {
+        if (!Array.isArray(cfg.includes))
+            return "includes must be an array";
+        for (const inc of cfg.includes) {
+            if (typeof inc === "string")
+                continue;
+            if (!inc || typeof inc !== "object")
+                return "includes entries must be a string or { src, dest? }";
+            if (typeof inc.src !== "string" || inc.src.length === 0)
+                return "includes entry is missing a non-empty 'src'";
+            if (inc.dest !== undefined && (typeof inc.dest !== "string" || inc.dest.length === 0))
+                return `includes entry "${inc.src}" has an invalid 'dest'`;
+        }
+    }
     if (cfg.excludes && !Array.isArray(cfg.excludes))
         return "excludes must be an array";
     if (cfg.switch_host && typeof cfg.switch_host !== "string")

package/package.json

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