badmfck-api-server 4.1.44 → 4.1.46

package/dist/apiServer/deployment/Deploy.js

@@ -67,6 +67,7 @@ async function Deploy(opt) {
     var execResult = run("npm run build");
     console.log(execResult);
     const items = [];
+    let spaMode = false;
     const binExists = fs_1.default.existsSync("./bin");
     if (binExists) {
         items.push("./bin");
@@ -78,8 +79,8 @@ async function Deploy(opt) {
         }
     }
     else if (fs_1.default.existsSync("./dist") && fs_1.default.existsSync(path_1.default.resolve("dist", "index.html"))) {
-        console.log("No ./bin found — detected ./dist with index.html, using it as distribution");
-        items.push("./dist");
+        spaMode = true;
+        console.log("No ./bin found — using entire ./dist contents as distribution");
     }
     if (Array.isArray(opt.includes)) {
         for (const inc of opt.includes) {
@@ -95,8 +96,8 @@ async function Deploy(opt) {
             items.push(inc);
         }
     }
-    if (items.length === 0) {
-        throw new Error("Nothing to archive (no ./bin and no includes specified)");
+    if (items.length === 0 && !spaMode) {
+        throw new Error("Nothing to archive (no ./bin, no ./dist/index.html, no valid includes)");
     }
     const excludes = new Set();
     const addExclude = (raw, source) => {
@@ -122,11 +123,28 @@ async function Deploy(opt) {
             addExclude(ex, "config.excludes");
     }
     const excludeArgs = Array.from(excludes).map(p => `--exclude=${p}`);
-    console.log("Archiving:", items.join(", "));
+    const tarArgs = ["-czvf", archiveName, ...excludeArgs];
+    if (spaMode) {
+        tarArgs.push("-C", "./dist", ".");
+        if (items.length > 0) {
+            tarArgs.push("-C", process.cwd(), ...items);
+        }
+    }
+    else {
+        tarArgs.push(...items);
+    }
+    if (spaMode) {
+        console.log("Archiving: contents of ./dist (recursively, at archive root)");
+        if (items.length > 0)
+            console.log("Also archiving from cwd:", items.join(", "));
+    }
+    else {
+        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" });
+        (0, child_process_1.execFileSync)("tar", tarArgs, { encoding: "utf-8", stdio: "inherit" });
     }
     catch (err) {
         console.error(`\ntar failed while creating ${archiveName}\n`);
@@ -155,12 +173,35 @@ async function Deploy(opt) {
         headersTimeout: 5 * 60 * 1000,
         bodyTimeout: 5 * 60 * 1000,
     });
-    const uploadResponse = await __1.Http.post(opt.host, formData, {
-        headers: { authorization: `Bearer ${authToken}` },
-        dispatcher: uploadAgent,
-        timeoutMs: 5 * 60 * 1000,
-        retry: { enabled: false },
-    });
+    const abortController = new AbortController();
+    const abortTimer = setTimeout(() => abortController.abort(), 5 * 60 * 1000);
+    let uploadResponse;
+    try {
+        const res = await fetch(opt.host, {
+            method: "POST",
+            headers: { authorization: `Bearer ${authToken}` },
+            body: formData,
+            signal: abortController.signal,
+            ...{ dispatcher: uploadAgent },
+        });
+        const rawText = await res.text();
+        let parsed;
+        try {
+            parsed = rawText.length > 0 ? JSON.parse(rawText) : null;
+        }
+        catch {
+            parsed = rawText;
+        }
+        uploadResponse = res.ok
+            ? { ok: true, status: res.status, data: parsed }
+            : { ok: false, status: res.status, error: parsed };
+    }
+    catch (err) {
+        uploadResponse = { ok: false, error: err };
+    }
+    finally {
+        clearTimeout(abortTimer);
+    }
     const 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;

package/package.json

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