badmfck-api-server 1.3.5 → 1.3.7

package/dist/apiServer/APIService.js

@@ -10,6 +10,7 @@ const cors_1 = __importDefault(require("cors"));
 const BaseEndpoint_1 = require("./BaseEndpoint");
 const DefaultErrors_1 = __importDefault(require("./structures/DefaultErrors"));
 const badmfck_signal_1 = require("badmfck-signal");
+const LogService_1 = require("./LogService");
 function getDefaultOptions() {
     return {
         port: 8091,
@@ -20,10 +21,10 @@ function getDefaultOptions() {
         endpoints: [],
         jsonLimit: "10mb",
         onNetworkLog: function (log) {
-            console.log(log);
+            (0, LogService_1.logInfo)(log);
         },
         onError: function (err) {
-            console.error.call(this, err);
+            (0, LogService_1.logError)(err);
         },
         isProductionEnvironment: false
     };
@@ -42,7 +43,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "1.2.9";
+    version = "1.3.7";
     options;
     netLog = [];
     constructor(options) {
@@ -203,7 +204,10 @@ class APIService extends BaseService_1.BaseService {
                         for (let i in data.headers)
                             res.setHeader(i, data.headers[i]);
                     }
-                    res.statusCode = data.httpStatus ?? 200;
+                    if (data.error && data.error.httpStatus && data.error.httpStatus > 99)
+                        res.statusCode = data.error.httpStatus;
+                    else
+                        res.statusCode = data.httpStatus ?? 200;
                     if (data.rawResponse) {
                         res.send(data.data);
                         if (log)

package/dist/apiServer/BaseEndpoint.d.ts

@@ -7,8 +7,9 @@ export interface IBaseEndpoint {
 }
 export interface IEndpointHandler {
     endpoint: string;
-    handler: (req: HTTPRequestVO) => Promise<TransferPacketVO<any>>;
+    handler?: (req: HTTPRequestVO) => Promise<TransferPacketVO<any>>;
     ignoreInterceptor?: boolean;
+    independed?: boolean;
 }
 export declare class BaseEndpoint implements IBaseEndpoint {
     endpoints?: IEndpointHandler[];

package/dist/apiServer/BaseEndpoint.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseEndpoint = void 0;
+const LogService_1 = require("./LogService");
 const DefaultErrors_1 = __importDefault(require("./structures/DefaultErrors"));
 class BaseEndpoint {
     endpoints;
@@ -34,23 +35,24 @@ class BaseEndpoint {
                 i.endpoint = i.endpoint.substring(1);
             if (i.endpoint.endsWith("/"))
                 i.endpoint = i.endpoint.substring(0, i.endpoint.length - 1);
-            i.endpoint = this.endpoint + i.endpoint;
+            if (!i.independed)
+                i.endpoint = this.endpoint + i.endpoint;
         }
         this.endpoints = endpoints;
     }
     async init() {
         if (!this.endpoints) {
-            console.error("No endpoints registered for " + this.endpoint);
+            (0, LogService_1.logInfo)("No endpoints registered for " + this.endpoint);
             return;
         }
         for (let i of this.endpoints)
-            console.log("endpoint: " + i.endpoint + " initalized, ignoreInterceptor: " + (i.ignoreInterceptor ?? "false"));
+            (0, LogService_1.logInfo)("endpoint: " + i.endpoint + " initalized, ignoreInterceptor: " + (i.ignoreInterceptor ?? "false"));
     }
     ;
     async execute(req) {
         if (this.endpoints && this.endpoints.length > 0) {
             for (let i of this.endpoints) {
-                if (BaseEndpoint.entrypoint + i.endpoint === req.endpoint)
+                if (BaseEndpoint.entrypoint + i.endpoint === req.endpoint && i.handler && typeof i.handler === "function")
                     return i.handler(req);
             }
         }

package/dist/apiServer/LocalRequest.js

@@ -5,38 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalRequest = void 0;
 const axios_1 = __importDefault(require("axios"));
-axios_1.default.interceptors.request.use((x) => {
-    console.log(`AXIOS REQ:\n\turl:${x.url}\n\tmethod: ${x.method}\n\tdata: ${(() => {
-        if (typeof x.data === "string")
-            return x.data;
-        return JSON.stringify(x.data, null, "\t\t");
-    })()}\n\theaders:\n${(() => {
-        let h = "";
-        for (let i in x.headers) {
-            if (h !== "")
-                h += "\n";
-            h += "\t\t" + i + " = " + x.headers[i];
-        }
-        return h;
-    })()}`);
-    return x;
-});
-axios_1.default.interceptors.response.use((x) => {
-    console.log(`AXIOS RESP:\n\tdata: ${(() => {
-        if (typeof x.data === "string")
-            return x.data;
-        return JSON.stringify(x.data, null, "\t\t");
-    })()}\n\theaders:\n${(() => {
-        let h = "";
-        for (let i in x.headers) {
-            if (h !== "")
-                h += "\n";
-            h += "\t\t" + i + " = " + x.headers[i];
-        }
-        return h;
-    })()}`);
-    return x;
-});
 const LocalRequest = async (ep, data, method, headers) => {
     let m = "get";
     if (method)

package/dist/apiServer/LogService.d.ts

@@ -0,0 +1,40 @@
+import Signal, { Req } from "badmfck-signal";
+import { BaseService } from "./BaseService";
+export type ILogItemLevel = "info" | "error" | "warn" | "crit";
+export interface ILogItem {
+    id: number;
+    level: ILogItemLevel;
+    time: number;
+    text: string;
+    date: string;
+}
+export interface ILogServiceOptions {
+    output?: (data?: any) => void;
+    stackSize: number;
+}
+export declare const getDefaultLogOptions: () => ILogServiceOptions;
+export declare const logInfo: (message: any, ...optional: any[]) => void;
+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;
+    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_FLUSH: Signal<void>;
+export declare const REQ_LOG: Req<{
+    lastID: number;
+} | null | undefined, ILogItem[]>;
+export declare class LogService extends BaseService {
+    epoch: number;
+    log: ILogItem[];
+    options: ILogServiceOptions;
+    level: "all" | ILogItemLevel;
+    constructor(opt?: ILogServiceOptions);
+    init(): Promise<void>;
+    createDate(d?: Date): string;
+    leadZero(num: number): string;
+    createText(data: any): string;
+}

package/dist/apiServer/LogService.js

@@ -0,0 +1,140 @@
+"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;
+};
+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;
+const badmfck_signal_1 = __importStar(require("badmfck-signal"));
+const BaseService_1 = require("./BaseService");
+const getDefaultLogOptions = () => {
+    return {
+        stackSize: 1000
+    };
+};
+exports.getDefaultLogOptions = getDefaultLogOptions;
+const logInfo = (message, ...optional) => { exports.S_LOG.invoke({ level: "info", data: [message, optional] }); };
+exports.logInfo = logInfo;
+const logWarn = (message, ...optional) => { exports.S_LOG.invoke({ level: "warn", data: [message, optional] }); };
+exports.logWarn = logWarn;
+const logCrit = (message, ...optional) => { exports.S_LOG.invoke({ level: "crit", data: [message, optional] }); };
+exports.logCrit = logCrit;
+const logError = (message, ...optional) => { exports.S_LOG.invoke({ 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();
+exports.S_LOG_CHANGE_LEVEL = new badmfck_signal_1.default();
+exports.S_LOG_FLUSH = new badmfck_signal_1.default();
+exports.REQ_LOG = new badmfck_signal_1.Req();
+class LogService extends BaseService_1.BaseService {
+    epoch = 1699476234961;
+    log = [];
+    options;
+    level = "all";
+    constructor(opt) {
+        super("LogService");
+        if (!opt)
+            opt = (0, exports.getDefaultLogOptions)();
+        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);
+                return result;
+            }
+            else
+                return [...this.log];
+        };
+        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;
+            }
+            const msg = log.data[0];
+            const optional = log.data[1];
+            let text = this.createText(msg);
+            if (optional) {
+                for (let i of optional)
+                    text += ", " + this.createText(optional);
+            }
+            const d = new Date();
+            const logitem = {
+                level: log.level,
+                id: ((+new Date()) - this.epoch),
+                text: text,
+                time: d.getTime(),
+                date: this.createDate(d)
+            };
+            if (this.options.output)
+                this.options.output(logitem.level + " > " + logitem.id.toString(16) + " > " + logitem.date + " > " + text);
+            exports.S_LOG_CREATED.invoke(logitem);
+            this.log.push(logitem);
+            let limit = this.options.stackSize ?? 1000;
+            if (limit > 10000)
+                limit = 10000;
+            if (this.log.length > limit)
+                this.log.shift();
+        });
+    }
+    createDate(d) {
+        if (!d)
+            d = new Date();
+        return d.getFullYear() + "-" + this.leadZero(d.getMonth() + 1) + "-" + this.leadZero(d.getDate()) + " " + this.leadZero(d.getHours()) + ":" + this.leadZero(d.getMinutes()) + ":" + this.leadZero(d.getSeconds());
+    }
+    leadZero(num) {
+        if (num < 10)
+            return "0" + num;
+        return num + "";
+    }
+    createText(data) {
+        if (data === null)
+            return "null";
+        if (data === undefined)
+            return "undefined";
+        let res = "";
+        if (typeof data === "object") {
+            if ("toString" in data && data.toString && typeof data.toString === "function") {
+                res = data.toString();
+            }
+            else {
+                try {
+                    const tmp = JSON.stringify(data, null, "\t");
+                    res = tmp ?? "";
+                }
+                catch (e) {
+                    res = `${data}`;
+                }
+            }
+        }
+        else {
+            res = data + "";
+        }
+        if (res.length > 1024)
+            res = res.substring(0, 1024) + "... (total: " + res.length + ")";
+        return res;
+    }
+}
+exports.LogService = LogService;

package/dist/apiServer/MysqlService.d.ts

@@ -10,7 +10,6 @@ export interface MysqlServiceOptions {
     password: string;
     port: number;
     database: string;
-    onLog?: (level: number, data: any) => void;
 }
 export interface MysqlResult {
     error?: MysqlError | null;

package/dist/apiServer/MysqlService.js

@@ -8,6 +8,7 @@ const mysql_1 = __importDefault(require("mysql"));
 const BaseService_1 = require("./BaseService");
 const badmfck_signal_1 = require("badmfck-signal");
 const crypto_1 = require("crypto");
+const LogService_1 = require("./LogService");
 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;
@@ -47,21 +48,18 @@ class MysqlService extends BaseService_1.BaseService {
         };
     }
     async recreatePool() {
-        if (this.options.onLog)
-            this.options.onLog(1, "Mysql server trying to create pool");
+        (0, LogService_1.logInfo)("Mysql server trying to create pool");
         this.serviceStarted = false;
         const ok = await this.createPool();
         if (!ok) {
-            if (this.options.onLog)
-                this.options.onLog(2, "Mysql server not connected, retrying in 3 sec");
+            (0, LogService_1.logWarn)("Mysql server not connected, retrying in 3 sec");
             if (this.timeoutID)
                 clearTimeout(this.timeoutID);
             this.timeoutID = setTimeout(() => { this.recreatePool(); }, 3000);
         }
         else {
             this.serviceStarted = true;
-            if (this.options.onLog)
-                this.options.onLog(1, "Mysql Service started!");
+            (0, LogService_1.logInfo)("Mysql Service started!");
         }
     }
     async onApplicationReady() { }
@@ -134,8 +132,7 @@ class MysqlService extends BaseService_1.BaseService {
     async execute(query) {
         return new Promise((resolve, reject) => {
             if (!this.pool) {
-                if (this.options.onLog)
-                    this.options.onLog(2, "No pool");
+                (0, LogService_1.logError)("No pool");
                 resolve({
                     error: {
                         code: "NO_POOL",
@@ -152,8 +149,7 @@ class MysqlService extends BaseService_1.BaseService {
             }
             this.pool.getConnection((err, conn) => {
                 if (err) {
-                    if (this.options.onLog)
-                        this.options.onLog(2, `${err}`);
+                    (0, LogService_1.logError)(err);
                     if (`${err}`.indexOf('ECONNREFUSED') !== -1) {
                         this.recreatePool();
                     }
@@ -165,8 +161,7 @@ class MysqlService extends BaseService_1.BaseService {
                     return;
                 }
                 if (!conn) {
-                    if (this.options.onLog)
-                        this.options.onLog(2, `NO_CONN`);
+                    (0, LogService_1.logCrit)(`No connection created!`);
                     resolve({
                         error: {
                             code: "NO_CONN",
@@ -189,8 +184,7 @@ class MysqlService extends BaseService_1.BaseService {
                         conn.release();
                     }
                     catch (e) { }
-                    if (this.options.onLog)
-                        this.options.onLog(2, "QUERY_ERR " + e);
+                    (0, LogService_1.logError)("QUERY_ERR: " + e);
                     resolve({
                         error: {
                             code: "QUERY_ERR",
@@ -213,8 +207,7 @@ class MysqlService extends BaseService_1.BaseService {
             errCatched = true;
             conn.release();
             conn.removeAllListeners();
-            if (this.options.onLog)
-                this.options.onLog(2, `${err}`);
+            (0, LogService_1.logError)(err);
             conn.removeAllListeners();
             resolve({
                 error: {
@@ -229,8 +222,7 @@ class MysqlService extends BaseService_1.BaseService {
                 fields: null
             });
         });
-        if (this.options.onLog)
-            this.options.onLog(0, query);
+        (0, LogService_1.logInfo)(query);
         conn.query(query, (err, results, fields) => {
             conn.release();
             conn.removeAllListeners();
@@ -238,8 +230,7 @@ class MysqlService extends BaseService_1.BaseService {
                 return;
             if (err) {
                 const dup = `${err}`.toLowerCase().indexOf("er_dup_entry") !== -1;
-                if (this.options.onLog)
-                    this.options.onLog(2, `${err}`);
+                (0, LogService_1.logError)(err);
                 resolve({
                     error: err,
                     data: null,
@@ -257,20 +248,18 @@ class MysqlService extends BaseService_1.BaseService {
         });
     }
     async createPool() {
-        if (this.options.onLog)
-            this.options.onLog(1, "Connecting to mysql: \n HOST: " + this.options.host + '\n PORT:' + this.options.port);
+        (0, LogService_1.logInfo)("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 && this.options.onLog)
-                        this.options.onLog(2, err);
+                    if (err)
+                        (0, LogService_1.logError)(err);
                 });
             }
             catch (e) {
-                if (this.options.onLog)
-                    this.options.onLog(2, e);
+                (0, LogService_1.logCrit)(e);
             }
         }
         try {
@@ -285,14 +274,12 @@ class MysqlService extends BaseService_1.BaseService {
             });
         }
         catch (e) {
-            if (this.options.onLog)
-                this.options.onLog(2, "Can't connect to MYSQL!");
+            (0, LogService_1.logCrit)("Can't connect to MYSQL!");
             err = true;
         }
         if (!err && this.pool) {
             this.pool.on("error", (evt) => {
-                if (this.options.onLog)
-                    this.options.onLog(2, `${evt}`);
+                (0, LogService_1.logError)(evt);
             });
         }
         return new Promise((res, rej) => {
@@ -306,8 +293,7 @@ class MysqlService extends BaseService_1.BaseService {
             }
             this.pool.getConnection((e, cnn) => {
                 if (e) {
-                    if (this.options.onLog)
-                        this.options.onLog(2, e.message);
+                    (0, LogService_1.logError)(e.message);
                     res(false);
                     return;
                 }

package/dist/apiServer/structures/DefaultErrors.d.ts

@@ -1,7 +1,7 @@
-import { ErrorVO } from "./Interfaces";
+import { IError } from "./Interfaces";
 declare class DefaultErrors {
-    static NOT_IMPLEMENTED: ErrorVO;
-    static UNKNOWN_REQUEST: ErrorVO;
-    static JSON_MALFORMED: ErrorVO;
+    static NOT_IMPLEMENTED: IError;
+    static UNKNOWN_REQUEST: IError;
+    static JSON_MALFORMED: IError;
 }
 export default DefaultErrors;

package/dist/apiServer/structures/Interfaces.d.ts

@@ -1,6 +1,6 @@
 export interface TransferPacketVO<T> {
     data?: T | null;
-    error?: ErrorVO | null;
+    error?: IError | null;
     responseTime?: number;
     version?: string;
     endpoint?: string;
@@ -22,8 +22,9 @@ export interface HTTPRequestVO {
     endpoint: string;
     interceptorResult?: TransferPacketVO<any>;
 }
-export interface ErrorVO {
+export interface IError {
     code: number;
     message: string;
     details?: string;
+    httpStatus?: number;
 }

package/dist/index.d.ts

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

package/dist/index.js

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

package/package.json

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