badmfck-api-server 3.1.7 → 3.1.8

package/dist/apiServer/APIService.js

@@ -36,8 +36,6 @@ const badmfck_signal_1 = require("badmfck-signal");
 const LogService_1 = require("./LogService");
 const Monitor_1 = require("./monitor/Monitor");
 const path_1 = __importDefault(require("path"));
-const crypto_1 = __importDefault(require("crypto"));
-const fs_1 = __importDefault(require("fs"));
 const express_fileupload_1 = __importDefault(require("express-fileupload"));
 const os_1 = __importDefault(require("os"));
 const Liveness_1 = require("./routes/Liveness");
@@ -97,7 +95,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "3.1.7";
+    version = "3.1.8";
     options;
     monitor = null;
     monitorIndexFile;
@@ -118,7 +116,7 @@ class APIService extends BaseService_1.BaseService {
             exports.REQ_DOC_USERS.listener = async () => this.options.access.documentation ?? [];
             this.monitor = new MonitorService_1.MonitorService();
             this.monitor.init();
-            this.options.endpoints.push(new Monitor_1.Monitor());
+            this.options.endpoints.push(new Monitor_1.Monitor(this.options));
         }
         this.options.endpoints.push(new Documentation_1.Documentation(this.options));
         this.options.endpoints.push(new ExternalServiceEndpoint_1.ExternalServiceEndpoint());
@@ -336,40 +334,6 @@ class APIService extends BaseService_1.BaseService {
         }
         app.use((req, res, next) => {
             const tme = +new Date();
-            if (this.monitor && this.options && this.options.monitor) {
-                if (req.method === "GET") {
-                    let monitorRequest = false;
-                    for (let i of this.options.monitor) {
-                        const hash = crypto_1.default.createHash("sha256").update(i.login + i.password).digest().toString("hex");
-                        if (req.originalUrl.endsWith("/sm-" + hash)) {
-                            monitorRequest = true;
-                            break;
-                        }
-                    }
-                    if (monitorRequest) {
-                        const date = new Date();
-                        try {
-                            if (!this.monitorIndexFile)
-                                this.monitorIndexFile = fs_1.default.readFileSync(path_1.default.resolve(__dirname, "monitor", "index.html"));
-                            res.setHeader("Content-Type", "text/html");
-                            res.setHeader("Content-Length", this.monitorIndexFile.byteLength);
-                            res.status(200).send(this.monitorIndexFile);
-                        }
-                        catch (e) {
-                            this.sendResponse(req.get("Referer") ?? "", res, {
-                                error: {
-                                    code: 10002,
-                                    message: "Internal server error",
-                                    details: `${e}`
-                                },
-                                data: null,
-                                httpStatus: 500
-                            }, tme, req.path);
-                        }
-                        return;
-                    }
-                }
-            }
             this.sendResponse(req.get("Referer") ?? "", res, {
                 error: DefaultErrors_1.default.UNKNOWN_REQUEST,
                 data: null,

package/dist/apiServer/LogService.d.ts

@@ -37,6 +37,7 @@ export declare const S_LOG: Signal<{
 }>;
 export declare const S_LOG_CREATED: Signal<ILogItem>;
 export declare const S_LOG_CHANGE_LEVEL: Signal<LOG_LEVEL>;
+export declare const REQ_CURRENT_LOG_LEVEL: Req<void, LOG_LEVEL>;
 export declare const S_LOG_FLUSH: Signal<void>;
 export declare const S_LOG_ADD_SERVICE_TO_WATCH: Signal<string>;
 export declare const S_LOG_REMOVE_SERVICE_FROM_WATCH: Signal<string>;

package/dist/apiServer/LogService.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogService = exports.REQ_LOG_UNIQUE_SERVICES = exports.REQ_LOG = exports.S_LOG_SET_TEXT_LIMIT = exports.S_LOG_REMOVE_SERVICE_FROM_WATCH = exports.S_LOG_ADD_SERVICE_TO_WATCH = exports.S_LOG_FLUSH = exports.S_LOG_CHANGE_LEVEL = exports.S_LOG_CREATED = exports.S_LOG = exports.logAPI = exports.logDB = exports.logError = exports.logCrit = exports.logWarn = exports.logInfo = exports.getDefaultLogOptions = exports.LOG_LEVEL = void 0;
+exports.LogService = exports.REQ_LOG_UNIQUE_SERVICES = exports.REQ_LOG = exports.S_LOG_SET_TEXT_LIMIT = exports.S_LOG_REMOVE_SERVICE_FROM_WATCH = exports.S_LOG_ADD_SERVICE_TO_WATCH = exports.S_LOG_FLUSH = exports.REQ_CURRENT_LOG_LEVEL = exports.S_LOG_CHANGE_LEVEL = exports.S_LOG_CREATED = exports.S_LOG = exports.logAPI = exports.logDB = exports.logError = exports.logCrit = exports.logWarn = exports.logInfo = exports.getDefaultLogOptions = exports.LOG_LEVEL = void 0;
 const badmfck_signal_1 = __importStar(require("badmfck-signal"));
 const BaseService_1 = require("./BaseService");
 var LOG_LEVEL;
@@ -44,21 +44,34 @@ const getDefaultLogOptions = () => {
     };
 };
 exports.getDefaultLogOptions = getDefaultLogOptions;
-const logInfo = (message, ...optional) => { exports.S_LOG.invoke({ level: LOG_LEVEL.INFO, data: [message, optional] }); };
+const logInfo = (message, ...optional) => {
+    exports.S_LOG.invoke({ level: LOG_LEVEL.INFO, data: [message, optional] });
+};
 exports.logInfo = logInfo;
-const logWarn = (message, ...optional) => { exports.S_LOG.invoke({ level: LOG_LEVEL.WARN, data: [message, optional] }); };
+const logWarn = (message, ...optional) => {
+    exports.S_LOG.invoke({ level: LOG_LEVEL.WARN, data: [message, optional] });
+};
 exports.logWarn = logWarn;
-const logCrit = (message, ...optional) => { exports.S_LOG.invoke({ level: LOG_LEVEL.CRIT, data: [message, optional] }); };
+const logCrit = (message, ...optional) => {
+    exports.S_LOG.invoke({ level: LOG_LEVEL.CRIT, data: [message, optional] });
+};
 exports.logCrit = logCrit;
-const logError = (message, ...optional) => { exports.S_LOG.invoke({ level: LOG_LEVEL.ERROR, data: [message, optional] }); };
+const logError = (message, ...optional) => {
+    exports.S_LOG.invoke({ level: LOG_LEVEL.ERROR, data: [message, optional] });
+};
 exports.logError = logError;
-const logDB = (message, ...optional) => { exports.S_LOG.invoke({ level: LOG_LEVEL.DB, data: [message, optional] }); };
+const logDB = (message, ...optional) => {
+    exports.S_LOG.invoke({ level: LOG_LEVEL.DB, data: [message, optional] });
+};
 exports.logDB = logDB;
-const logAPI = (message, ...optional) => { exports.S_LOG.invoke({ level: LOG_LEVEL.API, data: [message, optional] }); };
+const logAPI = (message, ...optional) => {
+    exports.S_LOG.invoke({ level: LOG_LEVEL.API, data: [message, optional] });
+};
 exports.logAPI = logAPI;
 exports.S_LOG = new badmfck_signal_1.default();
 exports.S_LOG_CREATED = new badmfck_signal_1.default();
 exports.S_LOG_CHANGE_LEVEL = new badmfck_signal_1.default();
+exports.REQ_CURRENT_LOG_LEVEL = new badmfck_signal_1.Req(undefined, "REQ_CURRENT_LOG_LEVEL");
 exports.S_LOG_FLUSH = new badmfck_signal_1.default();
 exports.S_LOG_ADD_SERVICE_TO_WATCH = new badmfck_signal_1.default();
 exports.S_LOG_REMOVE_SERVICE_FROM_WATCH = new badmfck_signal_1.default();
@@ -120,6 +133,7 @@ class LogService extends BaseService_1.BaseService {
             }
         });
         exports.S_LOG_CHANGE_LEVEL.subscribe(l => { this.level = l; });
+        exports.REQ_CURRENT_LOG_LEVEL.listener = async () => this.level;
         exports.S_LOG_FLUSH.subscribe(() => this.log = []);
         exports.S_LOG.subscribe((log) => {
             if (log.level < this.level)

package/dist/apiServer/db/MysqlAdapter.js

@@ -75,7 +75,7 @@ class MysqlAdapter {
             }
             this.transactions = this.transactions.filter(i => !removedIDs.includes(i.id));
             if (this.options.debug && count - this.transactions.length > 0)
-                console.log("Removed: ", count - this.transactions.length);
+                (0, LogService_1.logDB)("Removed: ", count - this.transactions.length);
             if (Date.now() - this.lastSuccessQueryTime > this.pingInterval) {
                 if (!this.pool)
                     return;
@@ -191,7 +191,7 @@ class MysqlAdapter {
         trxRequest.queries.push({ sql: "START TRANSACTION", status: "ok" });
         this.transactions.push(trxRequest);
         if (this.options.debug)
-            console.log("Transactions pool: ", this.transactions);
+            (0, LogService_1.logDB)("Transactions pool: ", this.transactions);
         return { data: { transactionId: trxid } };
     }
     async tCommit(trxid) {
@@ -369,7 +369,7 @@ class MysqlAdapter {
             conn.release();
             conn.removeAllListeners();
             if (this.options.debug)
-                console.log("Release connection: ", conn.threadId);
+                (0, LogService_1.logDB)("Release connection: ", conn.threadId);
         }
         catch (e) {
             (0, LogService_1.logCrit)("MysqlAdapter", `Can't release connection: ${e}`);
@@ -484,7 +484,7 @@ class MysqlAdapter {
     async rollbackTransaction(trx, donNotRemove) {
         let err = null;
         try {
-            console.log("Rollback started", trx.conn.threadId);
+            (0, LogService_1.logDB)("Rollback started", trx.conn.threadId);
             await trx.conn.rollback();
             await trx.conn.commit();
             trx.conn.removeAllListeners();
@@ -492,7 +492,7 @@ class MysqlAdapter {
             if (!donNotRemove)
                 this.transactions = this.transactions.filter(i => i.id !== trx.id);
             if (this.options.debug)
-                console.log("Rollback complete", trx.conn.threadId);
+                (0, LogService_1.logDB)("Rollback complete", trx.conn.threadId);
         }
         catch (e) {
             (0, LogService_1.logCrit)("MysqlAdapter", "Can't rollback transaction", trx.queries);
@@ -502,7 +502,7 @@ class MysqlAdapter {
         return err;
     }
     async finish() {
-        console.log("Finishing mysql service");
+        (0, LogService_1.logInfo)("Finishing mysql service");
         for (let i of this.transactions)
             this.rollbackTransaction(i);
         if (this.pool) {

package/dist/apiServer/documentation/Documentation.js

@@ -18,6 +18,7 @@ class Documentation extends BaseEndpoint_1.BaseEndpoint {
         super("doc");
         this.apiServiceOptions = options;
         this.ignoreInDocumentation = true;
+        this.ignoreHttpLogging = true;
         this.registerEndpoints([{
                 ignoreInDocumentation: true,
                 endpoint: "json",

package/dist/apiServer/monitor/Monitor.d.ts

@@ -1,4 +1,5 @@
 import { Signal } from "badmfck-signal";
+import { APIServiceOptions } from "../APIService";
 import { BaseEndpoint } from "../BaseEndpoint";
 import { HTTPRequestVO, TransferPacketVO } from "../structures/Interfaces";
 export interface IUserAction {
@@ -14,13 +15,17 @@ export declare const S_MONITOR_REGISTRATE_ACTION: Signal<IUserAction>;
 export declare class Monitor extends BaseEndpoint {
     ignoreHttpLogging: boolean;
     ignoreInDocumentation: boolean;
+    indexHtmlFile: string | null;
+    apiServiceOptions: APIServiceOptions;
     users: Map<string, IStatObject>;
-    constructor();
+    constructor(options: APIServiceOptions);
+    html(req: HTTPRequestVO): Promise<TransferPacketVO>;
     controllers(req: HTTPRequestVO): Promise<TransferPacketVO>;
+    changeLogLevel(req: HTTPRequestVO): Promise<TransferPacketVO>;
     logs(req: HTTPRequestVO): Promise<TransferPacketVO>;
     netlog(req: HTTPRequestVO): Promise<TransferPacketVO>;
     metrics(req: HTTPRequestVO): Promise<TransferPacketVO>;
     serverStat(req: HTTPRequestVO): Promise<TransferPacketVO>;
-    checkAuthentication(req: HTTPRequestVO): Promise<boolean>;
+    checkAuthentication(req: HTTPRequestVO): Promise<void>;
 }
 export {};

package/dist/apiServer/monitor/Monitor.js

@@ -12,25 +12,81 @@ const crypto_1 = __importDefault(require("crypto"));
 const os_1 = __importDefault(require("os"));
 const DefaultErrors_1 = __importDefault(require("../structures/DefaultErrors"));
 const MonitorService_1 = require("../MonitorService");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 exports.S_MONITOR_REGISTRATE_ACTION = new badmfck_signal_1.Signal();
+const logMap = {
+    ALL: 10,
+    API: 19,
+    INFO: 20,
+    DB: 25,
+    WARN: 30,
+    ERROR: 40,
+    CRIT: 50,
+};
 class Monitor extends BaseEndpoint_1.BaseEndpoint {
     ignoreHttpLogging = true;
     ignoreInDocumentation = true;
+    indexHtmlFile = null;
+    apiServiceOptions;
     users = new Map();
-    constructor() {
+    constructor(options) {
         super("--sys-monitor");
+        this.apiServiceOptions = options;
         this.registerEndpoints([
+            { ignoreInterceptor: true, endpoint: "html", handler: this.html },
             { ignoreInterceptor: true, endpoint: "log", handler: this.logs },
             { ignoreInterceptor: true, endpoint: "netlog", handler: this.netlog },
             { ignoreInterceptor: true, endpoint: "metrics", handler: this.metrics },
             { ignoreInterceptor: true, endpoint: "server", handler: this.serverStat },
-            { ignoreInterceptor: true, endpoint: "controllers", handler: this.controllers }
+            { ignoreInterceptor: true, endpoint: "controllers", handler: this.controllers },
+            { ignoreInterceptor: true, endpoint: "changeLogLevel", handler: this.changeLogLevel, validationModel: {
+                    level: Object.keys(logMap).join(",")
+                } }
         ]);
     }
+    async html(req) {
+        if (!this.indexHtmlFile) {
+            this.indexHtmlFile = fs_1.default.readFileSync(path_1.default.resolve(__dirname, "index.html")).toString("utf-8");
+            let bend = this.apiServiceOptions.baseEndPoint;
+            if (!bend.endsWith("/"))
+                bend += "/";
+            let end = this.endpoint;
+            if (!end.endsWith("/"))
+                end += "/";
+            if (end.startsWith("/"))
+                end = end.substring(1);
+            const endpoint = bend + end + "json";
+            this.indexHtmlFile = this.indexHtmlFile.replace(/{{host}}/g, endpoint);
+            let projectName = this.apiServiceOptions.projectName;
+            if (!projectName)
+                projectName = "API Server";
+            projectName += " - Monitoring";
+            if (this.apiServiceOptions.appVersion)
+                projectName += " (v.:" + this.apiServiceOptions.appVersion + ")";
+            this.indexHtmlFile = this.indexHtmlFile.replace(/{{title}}/g, projectName);
+        }
+        return {
+            rawResponse: true,
+            data: this.indexHtmlFile,
+            headers: {
+                "Content-Type": "text/html",
+                "Content-Length": this.indexHtmlFile.length.toString()
+            }
+        };
+    }
     async controllers(req) {
         this.checkAuthentication(req);
         return {};
     }
+    async changeLogLevel(req) {
+        this.checkAuthentication(req);
+        const val = logMap[req.data.level];
+        if (!val)
+            throw { ...DefaultErrors_1.default.BAD_REQUEST, details: "bad log level" };
+        LogService_1.S_LOG_CHANGE_LEVEL.invoke(req.data.level);
+        return { data: (await LogService_1.REQ_CURRENT_LOG_LEVEL.request()) };
+    }
     async logs(req) {
         this.checkAuthentication(req);
         const services = await LogService_1.REQ_LOG_UNIQUE_SERVICES.request();
@@ -65,23 +121,21 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
     }
     async checkAuthentication(req) {
         const users = await APIService_1.REQ_MONITOR_USERS.request();
-        const header = req.headers['authorization'];
+        if (!users || users.length == 0)
+            throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "No users found for documentation access" };
+        let header = req.headers['authorization'];
         if (!header)
             throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "No authorization header found" };
+        header = header.split(" ").pop() ?? "";
+        if (!header || header.length < 32)
+            throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "Wrong authorization header" };
         for (let i of users) {
-            let hashStr = "";
-            hashStr += req.endpoint;
-            hashStr += JSON.stringify(i);
-            hashStr += JSON.stringify(req.method.toUpperCase());
-            hashStr += JSON.stringify(req.data ?? {});
-            hashStr += JSON.stringify(req.params ?? {});
-            let token = null;
-            token = "sha256 " + crypto_1.default.createHash('sha256').update(hashStr).digest('hex');
-            if (token == header) {
-                return true;
+            const hash = crypto_1.default.createHash("sha256").update(i.login + ":" + i.password).digest("hex");
+            if (hash === header) {
+                return;
             }
         }
-        throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "Invalid token" };
+        throw { ...DefaultErrors_1.default.UNAUTHORIZED, details: "Invalid user" };
     }
 }
 exports.Monitor = Monitor;