badmfck-api-server 1.3.6 → 1.3.8

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.6";
+    version = "1.3.8";
     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) {
@@ -204,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/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,18 +24,20 @@ 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<void, ILogItem[]>;
+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;
+    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)
@@ -58,14 +66,19 @@ class LogService extends BaseService_1.BaseService {
     }
     async init() {
         super.init();
-        exports.REQ_LOG.listener = async () => [...this.log];
+        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;
-            }
+            if (log.level < this.level)
+                return;
             const msg = log.data[0];
             const optional = log.data[1];
             let text = this.createText(msg);
@@ -121,6 +134,8 @@ class LogService extends BaseService_1.BaseService {
                     res = `${data}`;
                 }
             }
+            if (Array.isArray(data))
+                res + ", total items: " + data.length;
         }
         else {
             res = data + "";

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/package.json

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