badmfck-api-server 1.3.7 → 1.3.9

package/dist/apiServer/APIService.js

@@ -43,7 +43,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "1.3.7";
+    version = "1.3.9";
     options;
     netLog = [];
     constructor(options) {
@@ -177,7 +177,7 @@ class APIService extends BaseService_1.BaseService {
             }, tme, req.path);
         });
         app.listen(this.options.port, () => {
-            console.log('API Service started at: ' + this.options.port + ", with base endpoint:" + this.options.baseEndPoint + ", ver.: " + this.version);
+            (0, LogService_1.logCrit)('API Service started at: ' + this.options.port + ", with base endpoint:" + this.options.baseEndPoint + ", ver.: " + this.version);
         });
     }
     sendResponse(res, data, requestTime, endpoint, log) {

package/dist/apiServer/BaseService.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseService = void 0;
+const LogService_1 = require("./LogService");
 class BaseService {
     name;
     constructor(name) {
         this.name = name;
     }
     async init() {
-        console.log("Service: " + this.name + " initialized");
+        (0, LogService_1.logInfo)("Service: " + this.name + " initialized");
     }
     applicationReady() { }
 }

package/dist/apiServer/LogService.d.ts

@@ -1,9 +1,15 @@
 import Signal, { Req } from "badmfck-signal";
 import { BaseService } from "./BaseService";
-export type ILogItemLevel = "info" | "error" | "warn" | "crit";
+export declare enum LOG_LEVEL {
+    ALL = 0,
+    INFO = 1,
+    WARN = 2,
+    ERROR = 3,
+    CRIT = 4
+}
 export interface ILogItem {
     id: number;
-    level: ILogItemLevel;
+    level: LOG_LEVEL;
     time: number;
     text: string;
     date: string;
@@ -18,11 +24,11 @@ export declare const logWarn: (message: any, ...optional: any[]) => void;
 export declare const logCrit: (message: any, ...optional: any[]) => void;
 export declare const logError: (message: any, ...optional: any[]) => void;
 export declare const S_LOG: Signal<{
-    level: ILogItemLevel;
+    level: LOG_LEVEL;
     data: any[];
 }>;
 export declare const S_LOG_CREATED: Signal<ILogItem>;
-export declare const S_LOG_CHANGE_LEVEL: Signal<ILogItemLevel | "all">;
+export declare const S_LOG_CHANGE_LEVEL: Signal<LOG_LEVEL>;
 export declare const S_LOG_FLUSH: Signal<void>;
 export declare const REQ_LOG: Req<{
     lastID: number;
@@ -31,7 +37,7 @@ export declare class LogService extends BaseService {
     epoch: number;
     log: ILogItem[];
     options: ILogServiceOptions;
-    level: "all" | ILogItemLevel;
+    level: LOG_LEVEL;
     constructor(opt?: ILogServiceOptions);
     init(): Promise<void>;
     createDate(d?: Date): string;

package/dist/apiServer/LogService.js

@@ -23,22 +23,30 @@ 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 = void 0;
+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;
 const badmfck_signal_1 = __importStar(require("badmfck-signal"));
 const BaseService_1 = require("./BaseService");
+var LOG_LEVEL;
+(function (LOG_LEVEL) {
+    LOG_LEVEL[LOG_LEVEL["ALL"] = 0] = "ALL";
+    LOG_LEVEL[LOG_LEVEL["INFO"] = 1] = "INFO";
+    LOG_LEVEL[LOG_LEVEL["WARN"] = 2] = "WARN";
+    LOG_LEVEL[LOG_LEVEL["ERROR"] = 3] = "ERROR";
+    LOG_LEVEL[LOG_LEVEL["CRIT"] = 4] = "CRIT";
+})(LOG_LEVEL || (exports.LOG_LEVEL = LOG_LEVEL = {}));
 const getDefaultLogOptions = () => {
     return {
         stackSize: 1000
     };
 };
 exports.getDefaultLogOptions = getDefaultLogOptions;
-const logInfo = (message, ...optional) => { exports.S_LOG.invoke({ 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: "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: "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: "error", data: [message, optional] }); };
+const logError = (message, ...optional) => { exports.S_LOG.invoke({ level: LOG_LEVEL.ERROR, data: [message, optional] }); };
 exports.logError = logError;
 exports.S_LOG = new badmfck_signal_1.default();
 exports.S_LOG_CREATED = new badmfck_signal_1.default();
@@ -49,7 +57,7 @@ class LogService extends BaseService_1.BaseService {
     epoch = 1699476234961;
     log = [];
     options;
-    level = "all";
+    level = LOG_LEVEL.ALL;
     constructor(opt) {
         super("LogService");
         if (!opt)
@@ -57,7 +65,6 @@ class LogService extends BaseService_1.BaseService {
         this.options = opt;
     }
     async init() {
-        super.init();
         exports.REQ_LOG.listener = async (req) => {
             if (req && req.lastID) {
                 let result = this.log.filter(val => val.id > req.lastID);
@@ -69,10 +76,8 @@ class LogService extends BaseService_1.BaseService {
         exports.S_LOG_CHANGE_LEVEL.subscribe(l => { this.level = l; });
         exports.S_LOG_FLUSH.subscribe(() => this.log = []);
         exports.S_LOG.subscribe((log) => {
-            if (log.level !== this.level) {
-                if (this.level !== "all")
-                    return;
-            }
+            if (log.level < this.level)
+                return;
             const msg = log.data[0];
             const optional = log.data[1];
             let text = this.createText(msg);
@@ -98,6 +103,7 @@ class LogService extends BaseService_1.BaseService {
             if (this.log.length > limit)
                 this.log.shift();
         });
+        super.init();
     }
     createDate(d) {
         if (!d)
@@ -128,6 +134,8 @@ class LogService extends BaseService_1.BaseService {
                     res = `${data}`;
                 }
             }
+            if (Array.isArray(data))
+                res + ", total items: " + data.length;
         }
         else {
             res = data + "";

package/package.json

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