badmfck-api-server 4.1.46 → 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/dist/apiServer/interceptors/InterceptorPayAuth.d.ts

@@ -0,0 +1,8 @@
+import { IInterceptor } from "../APIService";
+import { HTTPRequestVO } from "../structures/Interfaces";
+export declare class InterceptorPayAuth implements IInterceptor<any> {
+    intercept(req: HTTPRequestVO, authorizations: {
+        key: string;
+        kid: string;
+    }[]): Promise<any>;
+}

package/dist/apiServer/interceptors/InterceptorPayAuth.js

@@ -0,0 +1,77 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InterceptorPayAuth = void 0;
+const crypto_1 = __importDefault(require("crypto"));
+const Validator_1 = require("../helper/Validator");
+const DefaultErrors_1 = __importDefault(require("../structures/DefaultErrors"));
+const _TAuthParams = {
+    v: 0,
+    ts: "",
+    nonce: "",
+    kid: "",
+    alg: "",
+    $__alg_optional: true,
+    sig: ""
+};
+class InterceptorPayAuth {
+    async intercept(req, authorizations) {
+        const authScheme = "payauth ";
+        let headerData = req.headers["authorization"];
+        if (!headerData)
+            throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "No authorization header" };
+        if (!headerData.toLowerCase().startsWith(authScheme))
+            throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "wrong authorization scheme" };
+        const b64 = req.data.b64;
+        if (req.data.b64) {
+            let json = null;
+            try {
+                json = Buffer.from(req.data.b64, "base64").toString("utf-8");
+                json = JSON.parse(json);
+            }
+            catch (e) {
+                throw { ...DefaultErrors_1.default.BAD_REQUEST, details: "JSON malformed" };
+            }
+            req.data = json;
+        }
+        const params = {};
+        headerData.substring(authScheme.length).trim().split(",").forEach(v => {
+            v = v.trim();
+            const tmp = v.split("=");
+            if (tmp.length === 2) {
+                const key = tmp[0].trim().toLowerCase();
+                let value = tmp[1].trim();
+                if (value.startsWith("'") && value.endsWith("'")) {
+                    value = value.substring(1, value.length - 1);
+                }
+                params[key] = value;
+            }
+        });
+        const errors = await Validator_1.Validator.validateStructure(_TAuthParams, params);
+        if (errors)
+            throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "Malformed authorization header", stack: errors };
+        for (let i of authorizations) {
+            if (i.kid === params.kid) {
+                if (params.alg.toLowerCase() === "hmac-sha256") {
+                    if (b64) {
+                        const key = Buffer.from(i.key, "hex");
+                        const sig = crypto_1.default.createHmac("sha256", key).update(b64 + params.ts + params.nonce).digest("hex");
+                        if (sig === params.sig)
+                            return i;
+                        throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "Signature mismatch, calc:" + sig + ", got:" + params.sig, stack: params };
+                    }
+                    else {
+                        throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "Can't calc signature, no b64" };
+                    }
+                }
+                else {
+                    throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "Unsupported alg" };
+                }
+            }
+        }
+        throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "Key not found" };
+    }
+}
+exports.InterceptorPayAuth = InterceptorPayAuth;

package/dist/index.d.ts

@@ -18,4 +18,5 @@ import { MicroserviceHost } from "./apiServer/external/MicroserviceHost";
 import { MicroserviceClient } from "./apiServer/external/MicroserviceClient";
 import { Deploy } from "./apiServer/deployment/Deploy";
 import { Activate } from "./apiServer/deployment/Activate";
-export { MicroserviceHost, MicroserviceClient, Http, ZipUtils, UID, YYYYMMDDHH, JSONStableStringify, APIService, Initializer, LocalRequest, ValidationModel, MysqlService, TimeframeService, Validator, LogService, DataProvider, ErrorUtils, ExternalService, DBService, Deploy, Activate, S_MONITOR_REGISTRATE_ACTION };
+import { InterceptorPayAuth } from "./apiServer/interceptors/InterceptorPayAuth";
+export { MicroserviceHost, MicroserviceClient, Http, ZipUtils, UID, YYYYMMDDHH, JSONStableStringify, APIService, Initializer, LocalRequest, ValidationModel, MysqlService, TimeframeService, Validator, LogService, DataProvider, ErrorUtils, ExternalService, DBService, Deploy, Activate, InterceptorPayAuth, S_MONITOR_REGISTRATE_ACTION };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.S_MONITOR_REGISTRATE_ACTION = exports.Activate = exports.Deploy = exports.DBService = exports.ExternalService = exports.ErrorUtils = exports.DataProvider = exports.LogService = exports.Validator = exports.TimeframeService = exports.MysqlService = exports.LocalRequest = exports.Initializer = exports.APIService = exports.JSONStableStringify = exports.YYYYMMDDHH = exports.UID = exports.ZipUtils = exports.Http = exports.MicroserviceClient = exports.MicroserviceHost = void 0;
+exports.S_MONITOR_REGISTRATE_ACTION = exports.InterceptorPayAuth = exports.Activate = exports.Deploy = exports.DBService = exports.ExternalService = exports.ErrorUtils = exports.DataProvider = exports.LogService = exports.Validator = exports.TimeframeService = exports.MysqlService = exports.LocalRequest = exports.Initializer = exports.APIService = exports.JSONStableStringify = exports.YYYYMMDDHH = exports.UID = exports.ZipUtils = exports.Http = exports.MicroserviceClient = exports.MicroserviceHost = void 0;
 const APIService_1 = require("./apiServer/APIService");
 Object.defineProperty(exports, "APIService", { enumerable: true, get: function () { return APIService_1.APIService; } });
 Object.defineProperty(exports, "Initializer", { enumerable: true, get: function () { return APIService_1.Initializer; } });
@@ -42,3 +42,5 @@ const Deploy_1 = require("./apiServer/deployment/Deploy");
 Object.defineProperty(exports, "Deploy", { enumerable: true, get: function () { return Deploy_1.Deploy; } });
 const Activate_1 = require("./apiServer/deployment/Activate");
 Object.defineProperty(exports, "Activate", { enumerable: true, get: function () { return Activate_1.Activate; } });
+const InterceptorPayAuth_1 = require("./apiServer/interceptors/InterceptorPayAuth");
+Object.defineProperty(exports, "InterceptorPayAuth", { enumerable: true, get: function () { return InterceptorPayAuth_1.InterceptorPayAuth; } });

package/package.json

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