badmfck-api-server 1.5.9 → 1.6.2

package/dist/apiServer/APIService.js

@@ -47,7 +47,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "1.5.5";
+    version = "1.6.2";
     options;
     monitor;
     monitorIndexFile;
@@ -63,11 +63,11 @@ class APIService extends BaseService_1.BaseService {
         if (this.options.monitor && this.options.monitor.length > 0) {
             this.monitor = new Monitor_1.Monitor();
             this.options.endpoints.push(this.monitor);
-            console.log("Service Monitor initialized");
-            console.log("monitor links:");
+            console.warn("Service Monitor initialized");
+            console.warn("monitor links:");
             for (let i of this.options.monitor) {
                 const hash = crypto_1.default.createHash("sha256").update(i.login + i.password).digest().toString("hex");
-                console.log("/sm-" + hash);
+                console.warn(i.login + " -> /sm-" + hash);
             }
         }
     }
@@ -252,9 +252,9 @@ class APIService extends BaseService_1.BaseService {
             log.time = data.responseTime;
         if (res.destroyed || res.closed) {
             if (log)
-                log.error = "Connection already closed, can't send response";
+                log.error = "Connection already closed, can't send response for: " + data.endpoint;
             if (this.options.onError)
-                this.options.onError("Connection already closed, can't send response", data);
+                this.options.onError("Connection already closed, can't send response: " + data.endpoint, data);
             if (this.monitor)
                 this.monitor.registrateError(data.endpoint);
         }

package/dist/apiServer/LogService.d.ts

@@ -16,7 +16,7 @@ export interface ILogItem {
     source: string;
 }
 export interface ILogServiceOptions {
-    output?: (data?: any) => void;
+    output?: (data: ILogItem) => void;
     stackSize: number;
     level: LOG_LEVEL;
     textLimit: number;

package/dist/apiServer/LogService.js

@@ -153,8 +153,9 @@ class LogService extends BaseService_1.BaseService {
                 date: this.createDate(d),
                 source: source
             };
-            if (this.options.output)
-                this.options.output(logitem.source + " > " + logitem.level + " > " + logitem.date + " > " + text);
+            if (this.options.output) {
+                this.options.output(logitem);
+            }
             exports.S_LOG_CREATED.invoke(logitem);
             this.log.push(logitem);
             let limit = this.options.stackSize ?? 100;

package/dist/apiServer/MysqlService.d.ts

@@ -1,6 +1,7 @@
 import { FieldInfo, MysqlError, Pool, PoolConnection } from "mysql";
 import { BaseService } from "./BaseService";
-import { Req } from "badmfck-signal";
+import Signal, { Req } from "badmfck-signal";
+export declare const S_MYSQL_STARTED: Signal<void>;
 export declare const REQ_MYSQL_QUERY: Req<MySqlQuery | MySqlQuery[], MysqlResult[]>;
 export declare const executeQuery: (query: MySqlQuery | MySqlQuery[]) => Promise<MysqlResult[]>;
 export interface MysqlServiceOptions {

package/dist/apiServer/MysqlService.js

@@ -1,14 +1,38 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlService = exports.executeQuery = exports.REQ_MYSQL_QUERY = void 0;
+exports.MysqlService = exports.executeQuery = exports.REQ_MYSQL_QUERY = exports.S_MYSQL_STARTED = void 0;
 const mysql_1 = __importDefault(require("mysql"));
 const BaseService_1 = require("./BaseService");
-const badmfck_signal_1 = require("badmfck-signal");
+const badmfck_signal_1 = __importStar(require("badmfck-signal"));
 const crypto_1 = require("crypto");
 const LogService_1 = require("./LogService");
+exports.S_MYSQL_STARTED = new badmfck_signal_1.default();
 exports.REQ_MYSQL_QUERY = new badmfck_signal_1.Req("REQ_MYSQL_QUERY");
 const executeQuery = async (query) => { return await exports.REQ_MYSQL_QUERY.request(query); };
 exports.executeQuery = executeQuery;
@@ -60,6 +84,7 @@ class MysqlService extends BaseService_1.BaseService {
         else {
             this.serviceStarted = true;
             (0, LogService_1.logInfo)("${MysqlService.js}", "Mysql Service started!");
+            exports.S_MYSQL_STARTED.invoke();
         }
     }
     async onApplicationReady() { }

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

@@ -1,5 +1,9 @@
+import { Signal } from "badmfck-signal";
 import { BaseEndpoint } from "../BaseEndpoint";
 import { HTTPRequestVO, TransferPacketVO } from "../structures/Interfaces";
+export interface IUserAction {
+    action: string;
+}
 interface IStatObject {
     requests: Map<string, number>;
     errors: Map<string, number>;
@@ -11,12 +15,15 @@ interface ISystemStat {
     memoryTotal: number;
     memoryUsage: any;
 }
+export declare const S_MONITOR_REGISTRATE_ACTION: Signal<IUserAction>;
 export declare class Monitor extends BaseEndpoint {
     ignoreHttpLogging: boolean;
-    private startedAt;
     private httpRequests;
     private systemStat;
+    private userActions;
+    private registeredActions;
     constructor();
+    registrateAction(data: IUserAction): void;
     addSystemStat(): void;
     registrateError(endpoint: string): void;
     registrateFatalError(endpoint: string): void;

package/dist/apiServer/monitor/Monitor.js

@@ -3,19 +3,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Monitor = void 0;
+exports.Monitor = exports.S_MONITOR_REGISTRATE_ACTION = void 0;
+const badmfck_signal_1 = require("badmfck-signal");
 const APIService_1 = require("../APIService");
 const BaseEndpoint_1 = require("../BaseEndpoint");
 const LogService_1 = require("../LogService");
 const crypto_1 = __importDefault(require("crypto"));
 const os_1 = __importDefault(require("os"));
+exports.S_MONITOR_REGISTRATE_ACTION = new badmfck_signal_1.Signal();
 class Monitor extends BaseEndpoint_1.BaseEndpoint {
     ignoreHttpLogging = true;
-    startedAt = +new Date();
     httpRequests = new Map();
     systemStat = new Map();
+    userActions = new Map();
+    registeredActions = 0;
     constructor() {
         super("sys-monitor");
+        exports.S_MONITOR_REGISTRATE_ACTION.subscribe(data => this.registrateAction(data));
         this.registerEndpoints([
             { ignoreInterceptor: true, endpoint: "log", handler: this.logs },
             { ignoreInterceptor: true, endpoint: "netlog", handler: this.netlog },
@@ -27,6 +31,38 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
         }, 1000 * 60 * 10);
         this.addSystemStat();
     }
+    registrateAction(data) {
+        if (!data.action)
+            return;
+        if (typeof data.action !== "string")
+            return;
+        if (data.action.length > 20)
+            data.action = data.action.substring(0, 20);
+        const d = new Date();
+        const doy = this.getDateIndex(d);
+        let day = this.userActions.get(doy);
+        if (!day) {
+            day = new Map();
+            this.userActions.set(doy, day);
+            if (this.userActions.size > 7) {
+                for (let i of this.userActions) {
+                    this.userActions.delete(i[0]);
+                    break;
+                }
+            }
+        }
+        const minute = this.getHourMinuteIndex(d);
+        let m = day.get(minute);
+        if (!m) {
+            m = new Map();
+            day.set(minute, m);
+        }
+        let cnt = m.get(data.action);
+        if (!cnt)
+            cnt = 0;
+        cnt++;
+        m.set(data.action, cnt);
+    }
     addSystemStat() {
         const so = this.createSystemStatObj();
         so.memoryUsage = process.memoryUsage();
@@ -54,6 +90,7 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
             reqep = 0;
         reqep += 1;
         statObject.set(endpoint, reqep);
+        this.registeredActions++;
     }
     createStatObj() {
         const d = new Date();
@@ -62,7 +99,7 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
         if (!day) {
             day = new Map();
             this.httpRequests.set(dtm, day);
-            if (this.httpRequests.size > 14) {
+            if (this.httpRequests.size > 7) {
                 for (let i of this.httpRequests) {
                     this.httpRequests.delete(i[0]);
                     break;
@@ -89,7 +126,7 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
         if (!day) {
             day = new Map();
             this.systemStat.set(dtm, day);
-            if (this.systemStat.size > 14) {
+            if (this.systemStat.size > 7) {
                 for (let i of this.systemStat) {
                     this.systemStat.delete(i[0]);
                     break;
@@ -162,19 +199,37 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
         const date = new Date();
         const di = this.getDateIndex(date);
         const stat = this.httpRequests.get(di);
-        if (!stat)
-            return { data: [] };
         let result = [];
-        for (let minutes of stat) {
-            result.push({
-                m: minutes[0],
-                ae: this.mapToKeyValue(minutes[1].apiErrors),
-                e: this.mapToKeyValue(minutes[1].errors),
-                r: this.mapToKeyValue(minutes[1].requests),
-                fe: this.mapToKeyValue(minutes[1].fatalErrors),
-            });
+        if (stat) {
+            for (let minutes of stat) {
+                result.push({
+                    m: minutes[0],
+                    ae: this.mapToKeyValue(minutes[1].apiErrors),
+                    e: this.mapToKeyValue(minutes[1].errors),
+                    r: this.mapToKeyValue(minutes[1].requests),
+                    fe: this.mapToKeyValue(minutes[1].fatalErrors),
+                });
+            }
+        }
+        const ua = this.userActions.get(di);
+        let uaResult = [];
+        if (ua) {
+            for (let i of ua) {
+                const minutes = i[1];
+                const mArray = [];
+                for (let j of i[0]) {
+                    mArray.push({
+                        action: j[0],
+                        count: j[1]
+                    });
+                }
+                result.push({
+                    m: i[0],
+                    data: mArray
+                });
+            }
         }
-        return { data: { stat: result, date: +date } };
+        return { data: { stat: result, date: +date, userActions: uaResult } };
     }
     async serverStat(req) {
         const date = new Date();
@@ -192,8 +247,9 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
             });
         }
         return { data: {
-                uptime: process.uptime,
-                osUptime: os_1.default.uptime,
+                registeredActions: this.registeredActions,
+                uptime: process.uptime(),
+                osUptime: os_1.default.uptime(),
                 stat: result
             } };
     }

package/dist/index.d.ts

@@ -3,4 +3,5 @@ import { LocalRequest } from "./apiServer/LocalRequest";
 import { MysqlService } from "./apiServer/MysqlService";
 import { Validator } from "./apiServer/helper/Validator";
 import { LogService } from "./apiServer/LogService";
-export { APIService, Initializer, LocalRequest, MysqlService, Validator, LogService };
+import { S_MONITOR_REGISTRATE_ACTION } from "./apiServer/monitor/Monitor";
+export { APIService, Initializer, LocalRequest, MysqlService, Validator, LogService, S_MONITOR_REGISTRATE_ACTION };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogService = exports.Validator = exports.MysqlService = exports.LocalRequest = exports.Initializer = exports.APIService = void 0;
+exports.S_MONITOR_REGISTRATE_ACTION = exports.LogService = exports.Validator = exports.MysqlService = exports.LocalRequest = exports.Initializer = exports.APIService = 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; } });
@@ -12,3 +12,5 @@ const Validator_1 = require("./apiServer/helper/Validator");
 Object.defineProperty(exports, "Validator", { enumerable: true, get: function () { return Validator_1.Validator; } });
 const LogService_1 = require("./apiServer/LogService");
 Object.defineProperty(exports, "LogService", { enumerable: true, get: function () { return LogService_1.LogService; } });
+const Monitor_1 = require("./apiServer/monitor/Monitor");
+Object.defineProperty(exports, "S_MONITOR_REGISTRATE_ACTION", { enumerable: true, get: function () { return Monitor_1.S_MONITOR_REGISTRATE_ACTION; } });

package/package.json

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