badmfck-api-server 1.9.4 → 1.9.6

package/dist/apiServer/APIService.d.ts

@@ -1,8 +1,10 @@
+/// <reference types="node" />
 import { Application, Response } from 'express';
 import { BaseService, IBaseService } from './BaseService';
 import { IBaseEndpoint } from './BaseEndpoint';
 import { HTTPRequestVO, TransferPacketVO } from './structures/Interfaces';
 import { Req } from "badmfck-signal";
+import http from 'http';
 export interface APIServiceNetworkLogItem {
     id: number;
     created: number;
@@ -39,7 +41,10 @@ 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 const REQ_HTTP_SERVER: Req<void, {
+    express: Application;
+    http: http.Server;
+}>;
 export declare function Initializer(services: IBaseService[]): Promise<void>;
 export declare class APIService extends BaseService {
     private static nextLogID;
@@ -49,6 +54,7 @@ export declare class APIService extends BaseService {
     private monitorIndexFile?;
     private started;
     private requestsCount;
+    private server;
     netLog: APIServiceNetworkLogItem[];
     constructor(options?: APIServiceOptions | null);
     init(): Promise<void>;

package/dist/apiServer/APIService.js

@@ -1,4 +1,27 @@
 "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 };
 };
@@ -8,7 +31,7 @@ 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");
@@ -19,6 +42,7 @@ const express_fileupload_1 = __importDefault(require("express-fileupload"));
 const os_1 = __importDefault(require("os"));
 const Liveness_1 = require("./routes/Liveness");
 const Readiness_1 = require("./routes/Readiness");
+const http_1 = __importDefault(require("http"));
 function getDefaultOptions() {
     return {
         port: 8091,
@@ -58,12 +82,13 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "1.8.9";
+    version = "1.9.6";
     options;
     monitor;
     monitorIndexFile;
     started = new Date();
     requestsCount = 0;
+    server = http_1.default;
     netLog = [];
     constructor(options) {
         super('HTTP Service');
@@ -103,7 +128,8 @@ class APIService extends BaseService_1.BaseService {
             return log;
         };
         const app = (0, express_1.default)();
-        exports.REQ_HTTP_SERVER.listener = async (ignore) => app;
+        const server = http_1.default.createServer(app);
+        exports.REQ_HTTP_SERVER.listener = async (ignore) => { return { express: app, http: server }; };
         if (this.options.isProductionEnvironment)
             app.set("env", 'production');
         app.use(express_1.default.json({ limit: '10mb' }));
@@ -286,7 +312,7 @@ class APIService extends BaseService_1.BaseService {
                 httpStatus: 404
             }, tme, req.path);
         });
-        app.listen(this.options.port, () => {
+        server.listen(this.options.port, () => {
             (0, LogService_1.logCrit)('${APIService.js}', 'API Service started at: ' + this.options.port + ", with base endpoint:" + this.options.baseEndPoint + ", ver.: " + this.version);
         });
     }
@@ -299,6 +325,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/package.json

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