badmfck-api-server 1.3.6 → 1.3.7

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.7";
     options;
     netLog = [];
     constructor(options) {
@@ -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/LogService.d.ts

@@ -24,7 +24,9 @@ export declare const S_LOG: Signal<{
 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<void, ILogItem[]>;
+export declare const REQ_LOG: Req<{
+    lastID: number;
+} | null | undefined, ILogItem[]>;
 export declare class LogService extends BaseService {
     epoch: number;
     log: ILogItem[];

package/dist/apiServer/LogService.js

@@ -58,7 +58,14 @@ 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) => {

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.7",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",