badmfck-api-server 1.9.2 → 1.9.4

package/dist/apiServer/APIService.d.ts

@@ -1,4 +1,4 @@
-import { Response } from 'express';
+import { Application, Response } from 'express';
 import { BaseService, IBaseService } from './BaseService';
 import { IBaseEndpoint } from './BaseEndpoint';
 import { HTTPRequestVO, TransferPacketVO } from './structures/Interfaces';
@@ -39,6 +39,7 @@ export declare function getDefaultOptions(): APIServiceOptions;
 export declare const REQ_CREATE_NET_LOG: Req<void, APIServiceNetworkLogItem>;
 export declare const REQ_HTTP_LOG: Req<void, APIServiceNetworkLogItem[]>;
 export declare const REQ_HTTP_REQUESTS_COUNT: Req<void, number>;
+export declare const REQ_HTTP_SERVER: Req<void, Application>;
 export declare function Initializer(services: IBaseService[]): Promise<void>;
 export declare class APIService extends BaseService {
     private static nextLogID;

package/dist/apiServer/APIService.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.APIService = exports.Initializer = exports.REQ_HTTP_REQUESTS_COUNT = exports.REQ_HTTP_LOG = exports.REQ_CREATE_NET_LOG = exports.getDefaultOptions = void 0;
+exports.APIService = exports.Initializer = exports.REQ_HTTP_SERVER = exports.REQ_HTTP_REQUESTS_COUNT = exports.REQ_HTTP_LOG = exports.REQ_CREATE_NET_LOG = exports.getDefaultOptions = void 0;
 const express_1 = __importDefault(require("express"));
 const BaseService_1 = require("./BaseService");
 const cors_1 = __importDefault(require("cors"));
@@ -43,6 +43,7 @@ exports.getDefaultOptions = getDefaultOptions;
 exports.REQ_CREATE_NET_LOG = new badmfck_signal_1.Req(undefined, "REQ_CREATE_NET_LOG");
 exports.REQ_HTTP_LOG = new badmfck_signal_1.Req(undefined, "REQ_HTTP_LOG");
 exports.REQ_HTTP_REQUESTS_COUNT = new badmfck_signal_1.Req(undefined, "REQ_HTTP_REQUESTS_COUNT");
+exports.REQ_HTTP_SERVER = new badmfck_signal_1.Req(undefined, "REQ_HTTP_SERVER");
 const activeServices = [];
 const entryPoints = [];
 async function Initializer(services) {
@@ -102,6 +103,7 @@ class APIService extends BaseService_1.BaseService {
             return log;
         };
         const app = (0, express_1.default)();
+        exports.REQ_HTTP_SERVER.listener = async (ignore) => app;
         if (this.options.isProductionEnvironment)
             app.set("env", 'production');
         app.use(express_1.default.json({ limit: '10mb' }));

package/dist/apiServer/LogService.d.ts

@@ -55,5 +55,5 @@ export declare class LogService extends BaseService {
     checkTextLimit(): void;
     createDate(d?: Date): string;
     leadZero(num: number): string;
-    createText(data: any): string;
+    createText(data: any, level: LOG_LEVEL): string;
 }

package/dist/apiServer/LogService.js

@@ -120,7 +120,7 @@ class LogService extends BaseService_1.BaseService {
                 return;
             const msg = log.data[0];
             const optional = log.data[1];
-            let text = this.createText(msg);
+            let text = this.createText(msg, log.level);
             let source = "";
             if (text.startsWith("${") && text.endsWith("}") && text.indexOf(".js") !== -1) {
                 source = text.substring(2, text.length - 1);
@@ -142,7 +142,7 @@ class LogService extends BaseService_1.BaseService {
                 showlog = true;
             if (optional) {
                 for (let i of optional)
-                    text += ", " + this.createText(i);
+                    text += ", " + this.createText(i, this.level);
             }
             const d = new Date();
             const logitem = {
@@ -180,7 +180,7 @@ class LogService extends BaseService_1.BaseService {
             return "0" + num;
         return num + "";
     }
-    createText(data) {
+    createText(data, level) {
         if (data === null)
             return "null";
         if (data === undefined)
@@ -210,7 +210,7 @@ class LogService extends BaseService_1.BaseService {
         else {
             res = data + "";
         }
-        if (res.length > this.options.textLimit)
+        if (res.length > this.options.textLimit && level === LOG_LEVEL.INFO)
             res = res.substring(0, this.options.textLimit) + "... (total: " + res.length + ")";
         return res;
     }

package/dist/apiServer/WebsocketService.d.ts

@@ -1,5 +1,8 @@
 import { BaseService } from "./BaseService";
+export interface IWebSocketServiceOptions {
+}
 export declare class WebsocketService extends BaseService {
-    constructor();
+    options: IWebSocketServiceOptions;
+    constructor(opt?: IWebSocketServiceOptions);
     init(): Promise<void>;
 }

package/dist/apiServer/WebsocketService.js

@@ -2,9 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebsocketService = void 0;
 const BaseService_1 = require("./BaseService");
+const getDefaultWebSocketServiceOptions = () => {
+    return {};
+};
 class WebsocketService extends BaseService_1.BaseService {
-    constructor() {
+    options;
+    constructor(opt) {
         super("WebsocketService");
+        this.options = { ...getDefaultWebSocketServiceOptions(), opt };
     }
     async init() {
         super.init();

package/dist/apiServer/helper/UID.js

@@ -15,7 +15,7 @@ class UID {
             + Math.round(Math.random() * 1000)).toString(16), 'hex').toString('base64');
         uid = uid.replaceAll("=", "");
         uid = uid.replaceAll("+", ".");
-        uid = uid.replaceAll("/", "-");
+        uid = uid.replaceAll("/", "_");
         return uid;
     }
     static generateRandomNumberBase(count) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "badmfck-api-server",
-  "version": "1.9.2",
+  "version": "1.9.4",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,7 +26,7 @@
     "express": "^4.19.2",
     "express-fileupload": "^1.5.0",
     "mysql": "^2.18.1",
-    "ws": "^8.17.0"
+    "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/cors": "^2.8.13",