badmfck-api-server 4.1.45 → 4.1.47

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`);

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.45",
+  "version": "4.1.47",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",