badmfck-api-server 4.1.47 → 4.1.48

package/dist/apiServer/deployment/Deploy.js

@@ -173,35 +173,12 @@ async function Deploy(opt) {
         headersTimeout: 5 * 60 * 1000,
         bodyTimeout: 5 * 60 * 1000,
     });
-    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 uploadResponse = await __1.Http.post(opt.host, formData, {
+        headers: { authorization: `Bearer ${authToken}` },
+        dispatcher: uploadAgent,
+        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;
@@ -281,18 +258,23 @@ async function Deploy(opt) {
     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}`);
+    if (info && typeof info === "object" && "ok" in info) {
+        if (info.project && info.project !== opt.name) {
+            console.log(`  ${dim("server project:")} ${info.project}`);
+        }
+        if (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.bluegreen === false) {
+            console.log(`  ${dim("mode:    ")} single-instance ${green("← active")}`);
         }
-    }
-    else if (info && typeof info === "object" && info.bluegreen === false) {
-        console.log(`  ${dim("mode:    ")} single-instance`);
     }
     if (!emptyResponse) {
         const payload = JSON.stringify(body);

package/dist/apiServer/http/Http.js

@@ -43,6 +43,32 @@ function normalizeHeaders(headers) {
 function isRetryableStatus(status, retryOnStatuses) {
     return retryOnStatuses.includes(status);
 }
+function isFormDataLike(value) {
+    return (value !== null &&
+        typeof value === "object" &&
+        Object.prototype.toString.call(value) === "[object FormData]" &&
+        typeof value.entries === "function");
+}
+function normalizeFormData(source) {
+    if (source instanceof undici_1.FormData)
+        return source;
+    const target = new undici_1.FormData();
+    for (const [name, value] of source.entries()) {
+        if (typeof value === "string") {
+            target.append(name, value);
+        }
+        else {
+            target.append(name, value, value.name);
+        }
+    }
+    return target;
+}
+function removeContentTypeHeader(headers) {
+    for (const key of Object.keys(headers)) {
+        if (key.toLowerCase() === "content-type")
+            delete headers[key];
+    }
+}
 function isLikelyNetworkError(err) {
     if (!err || typeof err !== "object")
         return false;
@@ -423,11 +449,12 @@ class Http {
         let body = undefined;
         const hasBody = opts.body !== undefined && opts.body !== null;
         const allowBody = opts.allowBody ?? (opts.method !== "GET" && opts.method !== "DELETE");
+        let isMultipart = false;
         if (hasBody && allowBody) {
-            if (typeof FormData !== "undefined" && opts.body instanceof FormData) {
-                body = opts.body;
-                delete headers["content-type"];
-                delete headers["Content-Type"];
+            if (isFormDataLike(opts.body)) {
+                isMultipart = true;
+                body = normalizeFormData(opts.body);
+                removeContentTypeHeader(headers);
             }
             else {
                 const ct = (headers["content-type"] || headers["Content-Type"] || "").toLowerCase();
@@ -442,6 +469,9 @@ class Http {
                 }
             }
         }
+        if (isMultipart && retryCfg.maxAttempts !== 1) {
+            retryCfg.maxAttempts = 1;
+        }
         const responseType = opts.responseType ?? "json";
         const throwOnJsonParseError = opts.throwOnJsonParseError ?? false;
         let attemptsMade = 0;

package/package.json

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