badmfck-api-server 3.8.1 → 3.8.3

package/dist/apiServer/APIService.d.ts

@@ -22,7 +22,10 @@ export interface APIServiceNetworkLogItem {
     };
     error?: string | null;
 }
-export interface APIServiceOptions {
+export interface IInterceptor<T> {
+    intercept(req: HTTPRequestVO<any>): Promise<T | IError>;
+}
+export interface APIServiceOptions<TInterceptor = unknown> {
     port: number;
     baseEndPoint: string;
     corsHostWhiteList: string[];
@@ -32,7 +35,7 @@ export interface APIServiceOptions {
     onNetworkLog?: ((log: APIServiceNetworkLogItem) => void) | null;
     onError?: ((...rest: any[]) => void) | null;
     isProductionEnvironment: boolean;
-    interceptor?: IBaseEndpoint;
+    interceptor?: IInterceptor<TInterceptor>;
     postproducer?: (req: HTTPRequestVO | undefined | null, res: Response, data: TransferPacketVO<any>, requestTime: number, endpoint?: string, log?: APIServiceNetworkLogItem | null) => Promise<TransferPacketVO>;
     preproducer?: (req: HTTPRequestVO | undefined | null) => any;
     access: {
@@ -44,7 +47,10 @@ export interface APIServiceOptions {
     fileTempDir: string;
     fileLimit: number;
 }
-export declare function getDefaultOptions(): APIServiceOptions;
+type InferInterceptor<T> = T extends IInterceptor<infer U> ? U : unknown;
+export declare function getDefaultOptions<I extends IInterceptor<any> | undefined>(opts: Omit<APIServiceOptions<InferInterceptor<NonNullable<I>>>, 'interceptor'> & {
+    interceptor?: I;
+}): APIServiceOptions<InferInterceptor<NonNullable<I>>>;
 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>;
@@ -64,8 +70,9 @@ export declare class APIService extends BaseService {
     private started;
     private requestsCount;
     netLog: APIServiceNetworkLogItem[];
-    constructor(options?: APIServiceOptions | null);
+    constructor(options: APIServiceOptions);
     init(): Promise<void>;
     sendResponse(ref: string, res: Response, data: TransferPacketVO<any>, requestTime: number, endpoint?: string, log?: APIServiceNetworkLogItem | null, req?: HTTPRequestVO): Promise<void>;
     checkDataLength(data: any, result?: any, lvl?: number): any;
 }
+export {};

package/dist/apiServer/APIService.js

@@ -47,7 +47,10 @@ const MonitorService_1 = require("./MonitorService");
 const MysqlAdapter_1 = require("./db/MysqlAdapter");
 const DocumentService_1 = require("./DocumentService");
 const Documentation_1 = require("./documentation/Documentation");
-function getDefaultOptions() {
+function bindRequestToOptions(opts, req) {
+    return req;
+}
+function getDefaultOptions(opts) {
     return {
         port: 8091,
         access: {
@@ -95,7 +98,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "3.8.1";
+    version = "3.8.3";
     options;
     monitor = null;
     started = new Date();
@@ -103,7 +106,7 @@ class APIService extends BaseService_1.BaseService {
     netLog = [];
     constructor(options) {
         super('HTTP Service');
-        this.options = options ?? getDefaultOptions();
+        this.options = options;
         if (!this.options.corsHostWhiteList)
             this.options.corsHostWhiteList = [];
         const self = "http://localhost:" + this.options.port;
@@ -233,7 +236,7 @@ class APIService extends BaseService_1.BaseService {
                                 body[i] = req.query[i];
                             }
                         }
-                        const httpRequest = {
+                        let httpRequest = {
                             raw: req,
                             response: res,
                             method: req.method,
@@ -286,12 +289,14 @@ class APIService extends BaseService_1.BaseService {
                             if (!ignoreInterceptor) {
                                 let interceptorResult;
                                 if (this.options.interceptor) {
-                                    interceptorResult = await this.options.interceptor.__execute(httpRequest);
-                                    if (interceptorResult.error && !allowInterceptorError) {
+                                    const httpRequestBound = bindRequestToOptions(this.options, httpRequest);
+                                    interceptorResult = await this.options.interceptor.intercept(httpRequest);
+                                    if (DefaultErrors_1.ErrorUtils.isError(interceptorResult) && !allowInterceptorError) {
                                         this.sendResponse(req.get("Referer") ?? "", res, interceptorResult, tme, ep, log, httpRequest);
                                         return;
                                     }
-                                    httpRequest.interceptorResult = interceptorResult;
+                                    httpRequestBound.interceptorResult = interceptorResult;
+                                    httpRequest = httpRequestBound;
                                 }
                             }
                             const precheck = await i.__precheck(httpRequest);

package/dist/apiServer/TimeframeService.js

@@ -42,9 +42,8 @@ class TimeframeService extends BaseService_1.BaseService {
         super("TimeframeService");
     }
     async init() {
-        super.init();
         exports.REQ_TIMEFRAME_TASK_ADD.listener = async (req) => {
-            (0, LogService_1.logInfo)("Add tack to TimeframeService: " + req.name);
+            (0, LogService_1.logInfo)("Add tack " + req.name);
             this.tasks.push(req);
         };
         this.intervalId = setInterval(() => {
@@ -63,14 +62,14 @@ class TimeframeService extends BaseService_1.BaseService {
             if (now >= task.start && (!task.executed || task.executed < task.start)) {
                 if (now - task.start <= this.GRACE_WINDOW_MS) {
                     try {
-                        (0, LogService_1.logInfo)("Timeframe Servie - execute task ", task.name);
+                        (0, LogService_1.logInfo)("Execute task ", task.name);
                         if (task.callback.length > 0 && task.params)
                             task.callback(task.params);
                         else
                             task.callback();
                         task.executed = Date.now();
                         task.retries = 0;
-                        (0, LogService_1.logInfo)("Timeframe Servie - task executed ", task.name);
+                        (0, LogService_1.logInfo)("Executed task ", task.name);
                         if (task.repeat) {
                             task.start += task.repeat;
                         }

package/dist/apiServer/db/MysqlAdapter.d.ts

@@ -48,6 +48,7 @@ export declare class MysqlAdapter implements IDBAdapter {
     query(request: IDBQuery, conn?: mysql.PoolConnection): Promise<IDBResult>;
     finalizeConnection(conn: mysql.PoolConnection): void;
     prepareQuery(request: IDBQuery): string;
+    static safeReplace(query: string, key: string, value: string): string;
     static prepareQueryFieldValue(field: IDBQueryField): string | number | boolean | null | undefined;
     prepareCountQuery(query: string): string;
     commit(trx: ITransaction): Promise<IDBError | null>;

package/dist/apiServer/db/MysqlAdapter.js

@@ -519,7 +519,7 @@ class MysqlAdapter {
                     queryField.name = name.replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', "");
                 fields[i] = queryField;
                 const parsed = MysqlAdapter.prepareQueryFieldValue(fields[i]);
-                query = query.replaceAll("@" + name, parsed + "");
+                query = MysqlAdapter.safeReplace(query, "@" + name, parsed + "");
             }
         }
         const tmp = query.toLowerCase();
@@ -538,9 +538,8 @@ class MysqlAdapter {
                 insertFieldNames.push('`' + f.name + '`');
                 insertFieldValues.push(f.__parsedValue);
             }
-            query = query
-                .replaceAll('@fields', insertFieldNames.join(","))
-                .replaceAll('@values', insertFieldValues.join(","));
+            query = MysqlAdapter.safeReplace(query, "@fields", insertFieldNames.join(","));
+            query = MysqlAdapter.safeReplace(query, "@values", insertFieldValues.join(","));
         }
         if (query.indexOf("@insert") !== -1) {
             let oninsertNames = [];
@@ -554,7 +553,7 @@ class MysqlAdapter {
                 oninsertNames.push(f.name);
                 oninsertValues.push(f.__parsedValue);
             }
-            query = query.replaceAll("@insert", `(${oninsertNames.join(",")}) VALUES (${oninsertValues.join(",")})`);
+            query = MysqlAdapter.safeReplace(query, "@insert", `(${oninsertNames.join(",")}) VALUES (${oninsertValues.join(",")})`);
         }
         if (query.indexOf("@onupdate") !== -1) {
             let onUpdate = [];
@@ -566,7 +565,7 @@ class MysqlAdapter {
                     continue;
                 onUpdate.push('`' + f.name + '` = ' + f.__parsedValue);
             }
-            query = query.replaceAll("@onupdate", onUpdate.join(" , "));
+            query = MysqlAdapter.safeReplace(query, "@onupdate", onUpdate.join(" , "));
         }
         if (query.indexOf('@onduplicate') !== -1) {
             let onDuplicate = [];
@@ -578,10 +577,14 @@ class MysqlAdapter {
                     continue;
                 onDuplicate.push('`' + f.name + '` = ' + f.__parsedValue);
             }
-            query = query.replaceAll("@onduplicate", onDuplicate.join(" , "));
+            query = MysqlAdapter.safeReplace(query, "@onduplicate", onDuplicate.join(" , "));
         }
         return query;
     }
+    static safeReplace(query, key, value) {
+        const regex = new RegExp(key + "(?=\\b|\\s|,|\\)|$)", "g");
+        return query.replace(regex, value);
+    }
     static prepareQueryFieldValue(field) {
         let value = field.value;
         let system = field.system;

package/dist/apiServer/structures/Interfaces.d.ts

@@ -18,7 +18,7 @@ export interface TransferPacketVO<T = any> {
     blockResponse?: boolean;
     project?: string;
 }
-export interface HTTPRequestVO<T = any> {
+export interface HTTPRequestVO<T = any, TInterceport = any> {
     raw: any;
     response: any;
     method: string;
@@ -30,7 +30,7 @@ export interface HTTPRequestVO<T = any> {
         [key: string]: string;
     };
     endpoint: string;
-    interceptorResult?: TransferPacketVO<any>;
+    interceptorResult?: any;
     preproducerResult?: any;
     precheck?: TransferPacketVO<any> | null;
     files: FileArray | null | undefined;

package/dist/index.d.ts

@@ -10,4 +10,5 @@ import { UID } from "./apiServer/helper/UID";
 import { ExternalService } from "./apiServer/external/ExternalService";
 import { DBService } from "./apiServer/DBService";
 import { YYYYMMDDHH } from "./apiServer/helper/YYYYMMDDHH";
-export { UID, YYYYMMDDHH, APIService, Initializer, LocalRequest, ValidationModel, MysqlService, Validator, LogService, DataProvider, ErrorUtils, ExternalService, DBService, S_MONITOR_REGISTRATE_ACTION };
+import { TimeframeService } from "./apiServer/TimeframeService";
+export { UID, YYYYMMDDHH, APIService, Initializer, LocalRequest, ValidationModel, MysqlService, TimeframeService, Validator, LogService, DataProvider, ErrorUtils, ExternalService, DBService, S_MONITOR_REGISTRATE_ACTION };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.S_MONITOR_REGISTRATE_ACTION = exports.DBService = exports.ExternalService = exports.ErrorUtils = exports.DataProvider = exports.LogService = exports.Validator = exports.MysqlService = exports.LocalRequest = exports.Initializer = exports.APIService = exports.YYYYMMDDHH = exports.UID = void 0;
+exports.S_MONITOR_REGISTRATE_ACTION = exports.DBService = exports.ExternalService = exports.ErrorUtils = exports.DataProvider = exports.LogService = exports.Validator = exports.TimeframeService = exports.MysqlService = exports.LocalRequest = exports.Initializer = exports.APIService = exports.YYYYMMDDHH = exports.UID = void 0;
 const APIService_1 = require("./apiServer/APIService");
 Object.defineProperty(exports, "APIService", { enumerable: true, get: function () { return APIService_1.APIService; } });
 Object.defineProperty(exports, "Initializer", { enumerable: true, get: function () { return APIService_1.Initializer; } });
@@ -26,3 +26,5 @@ const DBService_1 = require("./apiServer/DBService");
 Object.defineProperty(exports, "DBService", { enumerable: true, get: function () { return DBService_1.DBService; } });
 const YYYYMMDDHH_1 = require("./apiServer/helper/YYYYMMDDHH");
 Object.defineProperty(exports, "YYYYMMDDHH", { enumerable: true, get: function () { return YYYYMMDDHH_1.YYYYMMDDHH; } });
+const TimeframeService_1 = require("./apiServer/TimeframeService");
+Object.defineProperty(exports, "TimeframeService", { enumerable: true, get: function () { return TimeframeService_1.TimeframeService; } });

package/package.json

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