badmfck-api-server 1.4.2 → 1.4.4

package/dist/apiServer/APIService.js

@@ -21,10 +21,10 @@ function getDefaultOptions() {
         endpoints: [],
         jsonLimit: "10mb",
         onNetworkLog: function (log) {
-            (0, LogService_1.logInfo)(log);
+            (0, LogService_1.logInfo)("${ApiService.js}", log);
         },
         onError: function (err) {
-            (0, LogService_1.logError)(err);
+            (0, LogService_1.logError)("${ApiService.js}", err);
         },
         isProductionEnvironment: false
     };
@@ -43,7 +43,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "1.4.2";
+    version = "1.4.4";
     options;
     netLog = [];
     constructor(options) {

package/dist/apiServer/LogService.d.ts

@@ -13,11 +13,13 @@ export interface ILogItem {
     time: number;
     text: string;
     date: string;
+    source: string;
 }
 export interface ILogServiceOptions {
     output?: (data?: any) => void;
     stackSize: number;
     level: LOG_LEVEL;
+    watchFor?: string[];
 }
 export declare const getDefaultLogOptions: () => ILogServiceOptions;
 export declare const logInfo: (message: any, ...optional: any[]) => void;
@@ -31,14 +33,21 @@ 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 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>;
 export declare const REQ_LOG: Req<{
     lastID: number;
 } | null | undefined, ILogItem[]>;
+export declare const REQ_LOG_UNIQUE_SERVICES: Req<void, {
+    name: string;
+    count: number;
+}[]>;
 export declare class LogService extends BaseService {
     epoch: number;
     log: ILogItem[];
     options: ILogServiceOptions;
     level: LOG_LEVEL;
+    uniqueServices: Map<string, number>;
     constructor(opt?: ILogServiceOptions);
     init(): Promise<void>;
     createDate(d?: Date): 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 = exports.S_LOG_FLUSH = exports.S_LOG_CHANGE_LEVEL = exports.S_LOG_CREATED = exports.S_LOG = 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_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.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;
@@ -53,12 +53,16 @@ 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.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();
 exports.REQ_LOG = new badmfck_signal_1.Req();
+exports.REQ_LOG_UNIQUE_SERVICES = new badmfck_signal_1.Req();
 class LogService extends BaseService_1.BaseService {
     epoch = 1699476234961;
     log = [];
     options;
     level = LOG_LEVEL.ALL;
+    uniqueServices = new Map();
     constructor(opt) {
         super("LogService");
         if (!opt)
@@ -67,6 +71,12 @@ class LogService extends BaseService_1.BaseService {
         this.level = opt.level;
     }
     async init() {
+        exports.REQ_LOG_UNIQUE_SERVICES.listener = async () => {
+            const arr = [];
+            for (let i of this.uniqueServices)
+                arr.push({ name: i[0], count: i[1] });
+            return arr;
+        };
         exports.REQ_LOG.listener = async (req) => {
             if (req && req.lastID) {
                 let result = this.log.filter(val => val.id > req.lastID);
@@ -75,6 +85,27 @@ class LogService extends BaseService_1.BaseService {
             else
                 return [...this.log];
         };
+        exports.S_LOG_ADD_SERVICE_TO_WATCH.subscribe(service => {
+            if (!this.options.watchFor)
+                this.options.watchFor = [];
+            if (this.options.watchFor.find(val => val === service)) {
+                (0, exports.logCrit)("${LogService.js}", "Service \"" + service + "\" aleready added");
+                return;
+            }
+            this.options.watchFor.push(service);
+        });
+        exports.S_LOG_REMOVE_SERVICE_FROM_WATCH.subscribe(service => {
+            if (!this.options.watchFor)
+                return;
+            try {
+                const i = this.options.watchFor.findIndex(val => val === service);
+                if (i > -1)
+                    this.options.watchFor.splice(i, 1);
+            }
+            catch (e) {
+                (0, exports.logCrit)("${LogService.js}", "Service \"" + service + "\" not deleted");
+            }
+        });
         exports.S_LOG_CHANGE_LEVEL.subscribe(l => { this.level = l; });
         exports.S_LOG_FLUSH.subscribe(() => this.log = []);
         exports.S_LOG.subscribe((log) => {
@@ -83,9 +114,28 @@ class LogService extends BaseService_1.BaseService {
             const msg = log.data[0];
             const optional = log.data[1];
             let text = this.createText(msg);
+            let source = "";
+            if (text.startsWith("${") && text.endsWith("}") && text.indexOf(".js") !== -1) {
+                source = text.substring(2, text.length - 1);
+                text = "";
+            }
+            const usc = this.uniqueServices.get(source) ?? 0;
+            this.uniqueServices.set(source, usc + 1);
+            let showlog = true;
+            if (this.options && this.options.watchFor && Array.isArray(this.options.watchFor) && this.options.watchFor.length > 0) {
+                showlog = false;
+                for (let i of this.options.watchFor) {
+                    if (source.toLowerCase().indexOf(i.toLowerCase()) !== -1) {
+                        showlog = true;
+                        break;
+                    }
+                }
+            }
+            if (!showlog && this.level === LOG_LEVEL.CRIT)
+                showlog = true;
             if (optional) {
                 for (let i of optional)
-                    text += ", " + this.createText(optional);
+                    text += ", " + this.createText(i);
             }
             const d = new Date();
             const logitem = {
@@ -93,10 +143,11 @@ class LogService extends BaseService_1.BaseService {
                 id: ((+new Date()) - this.epoch),
                 text: text,
                 time: d.getTime(),
-                date: this.createDate(d)
+                date: this.createDate(d),
+                source: source
             };
             if (this.options.output)
-                this.options.output(logitem.level + " > " + logitem.date + " > " + text);
+                this.options.output(logitem.source + " > " + logitem.level + " > " + logitem.date + " > " + text);
             exports.S_LOG_CREATED.invoke(logitem);
             this.log.push(logitem);
             let limit = this.options.stackSize ?? 1000;
@@ -136,6 +187,15 @@ class LogService extends BaseService_1.BaseService {
                     res = `${data}`;
                 }
             }
+            if (res === "[object Map]" && "size" in data) {
+                try {
+                    const arr = [];
+                    for (let i of data)
+                        arr.push({ key: i[0], value: i[1] });
+                    res = "MAP (size:" + data.size + ") \n" + JSON.stringify(arr, null, "\t");
+                }
+                catch (e) { }
+            }
             if (Array.isArray(data))
                 res + ", total items: " + data.length;
         }

package/dist/apiServer/MysqlService.js

@@ -48,18 +48,18 @@ class MysqlService extends BaseService_1.BaseService {
         };
     }
     async recreatePool() {
-        (0, LogService_1.logInfo)("Mysql server trying to create pool");
+        (0, LogService_1.logInfo)("${MysqlService.js}", "Mysql server trying to create pool");
         this.serviceStarted = false;
         const ok = await this.createPool();
         if (!ok) {
-            (0, LogService_1.logWarn)("Mysql server not connected, retrying in 3 sec");
+            (0, LogService_1.logWarn)("${MysqlService.js}", "Mysql server not connected, retrying in 3 sec");
             if (this.timeoutID)
                 clearTimeout(this.timeoutID);
             this.timeoutID = setTimeout(() => { this.recreatePool(); }, 3000);
         }
         else {
             this.serviceStarted = true;
-            (0, LogService_1.logInfo)("Mysql Service started!");
+            (0, LogService_1.logInfo)("${MysqlService.js}", "Mysql Service started!");
         }
     }
     async onApplicationReady() { }
@@ -132,7 +132,7 @@ class MysqlService extends BaseService_1.BaseService {
     async execute(query) {
         return new Promise((resolve, reject) => {
             if (!this.pool) {
-                (0, LogService_1.logError)("No pool");
+                (0, LogService_1.logError)("${MysqlService.js}", "No pool");
                 resolve({
                     error: {
                         code: "NO_POOL",
@@ -149,7 +149,7 @@ class MysqlService extends BaseService_1.BaseService {
             }
             this.pool.getConnection((err, conn) => {
                 if (err) {
-                    (0, LogService_1.logError)(err);
+                    (0, LogService_1.logError)("${MysqlService.js}", err);
                     if (`${err}`.indexOf('ECONNREFUSED') !== -1) {
                         this.recreatePool();
                     }
@@ -161,7 +161,7 @@ class MysqlService extends BaseService_1.BaseService {
                     return;
                 }
                 if (!conn) {
-                    (0, LogService_1.logCrit)(`No connection created!`);
+                    (0, LogService_1.logCrit)("${MysqlService.js}", `No connection created!`);
                     resolve({
                         error: {
                             code: "NO_CONN",
@@ -184,7 +184,7 @@ class MysqlService extends BaseService_1.BaseService {
                         conn.release();
                     }
                     catch (e) { }
-                    (0, LogService_1.logError)("QUERY_ERR: " + e);
+                    (0, LogService_1.logError)("${MysqlService.js}", "QUERY_ERR: " + e);
                     resolve({
                         error: {
                             code: "QUERY_ERR",
@@ -207,7 +207,7 @@ class MysqlService extends BaseService_1.BaseService {
             errCatched = true;
             conn.release();
             conn.removeAllListeners();
-            (0, LogService_1.logError)(err);
+            (0, LogService_1.logError)("${MysqlService.js}", err);
             conn.removeAllListeners();
             resolve({
                 error: {
@@ -222,7 +222,7 @@ class MysqlService extends BaseService_1.BaseService {
                 fields: null
             });
         });
-        (0, LogService_1.logInfo)(query);
+        (0, LogService_1.logInfo)("${MysqlService.js}", query);
         conn.query(query, (err, results, fields) => {
             conn.release();
             conn.removeAllListeners();
@@ -230,7 +230,7 @@ class MysqlService extends BaseService_1.BaseService {
                 return;
             if (err) {
                 const dup = `${err}`.toLowerCase().indexOf("er_dup_entry") !== -1;
-                (0, LogService_1.logError)(err);
+                (0, LogService_1.logError)("${MysqlService.js}", err);
                 resolve({
                     error: err,
                     data: null,
@@ -248,18 +248,18 @@ class MysqlService extends BaseService_1.BaseService {
         });
     }
     async createPool() {
-        (0, LogService_1.logInfo)("Connecting to mysql: \n HOST: " + this.options.host + '\n PORT:' + this.options.port);
+        (0, LogService_1.logInfo)("${MysqlService.js}", "Connecting to mysql: \n HOST: " + this.options.host + '\n PORT:' + this.options.port);
         let err = false;
         if (this.pool) {
             try {
                 this.pool.removeAllListeners();
                 this.pool.end(err => {
                     if (err)
-                        (0, LogService_1.logError)(err);
+                        (0, LogService_1.logError)("${MysqlService.js}", err);
                 });
             }
             catch (e) {
-                (0, LogService_1.logCrit)(e);
+                (0, LogService_1.logCrit)("${MysqlService.js}", e);
             }
         }
         try {
@@ -274,12 +274,12 @@ class MysqlService extends BaseService_1.BaseService {
             });
         }
         catch (e) {
-            (0, LogService_1.logCrit)("Can't connect to MYSQL!");
+            (0, LogService_1.logCrit)("${MysqlService.js}", "Can't connect to MYSQL!");
             err = true;
         }
         if (!err && this.pool) {
             this.pool.on("error", (evt) => {
-                (0, LogService_1.logError)(evt);
+                (0, LogService_1.logError)("${MysqlService.js}", evt);
             });
         }
         return new Promise((res, rej) => {
@@ -293,7 +293,7 @@ class MysqlService extends BaseService_1.BaseService {
             }
             this.pool.getConnection((e, cnn) => {
                 if (e) {
-                    (0, LogService_1.logError)(e.message);
+                    (0, LogService_1.logError)("${MysqlService.js}", e.message);
                     res(false);
                     return;
                 }

package/package.json

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