badmfck-api-server 1.9.3 → 1.9.5

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

@@ -1,14 +1,37 @@
 "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.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"));
 const BaseEndpoint_1 = require("./BaseEndpoint");
-const DefaultErrors_1 = __importDefault(require("./structures/DefaultErrors"));
+const DefaultErrors_1 = __importStar(require("./structures/DefaultErrors"));
 const badmfck_signal_1 = require("badmfck-signal");
 const LogService_1 = require("./LogService");
 const Monitor_1 = require("./monitor/Monitor");
@@ -43,6 +66,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 +126,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' }));
@@ -297,6 +322,8 @@ class APIService extends BaseService_1.BaseService {
                 (0, LogService_1.logError)("Postproducer error", e);
             }
         }
+        if (DefaultErrors_1.ErrorUtils.isError(data))
+            data = { error: data, data: null };
         data.responseTime = (+new Date()) - requestTime;
         data.core = this.version;
         data.endpoint = endpoint ?? "no_endpoint";

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.3",
+  "version": "1.9.5",
   "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",