badmfck-api-server 3.8.4 → 3.8.6

package/dist/apiServer/APIService.d.ts

@@ -40,7 +40,6 @@ export interface APIServiceOptions<TInterceptor = unknown> {
         monitor?: IMonitorUser[];
         documentation?: IMonitorUser[];
     };
-    monitor?: IMonitorUser[];
     appVersion?: string;
     fileTempDir: string;
     fileLimit: number;
@@ -61,7 +60,6 @@ export declare const REQ_MONITOR_USERS: Req<void, IMonitorUser[]>;
 export declare const REQ_DOC_USERS: Req<void, IMonitorUser[]>;
 export declare function Initializer(services: IBaseService[]): Promise<void>;
 export declare class APIService extends BaseService {
-    private static nextLogID;
     private version;
     private options;
     private monitor;

package/dist/apiServer/APIService.js

@@ -46,23 +46,22 @@ const MysqlAdapter_1 = require("./db/MysqlAdapter");
 const DocumentService_1 = require("./DocumentService");
 const Documentation_1 = require("./documentation/Documentation");
 let nextLogID = 0;
-function bindRequestToOptions(opts, req) {
-    return req;
-}
 function defaultOptions() {
     return {
         port: 8080,
         baseEndPoint: "/api/",
-        corsHostWhiteList: [],
-        projectName: "App",
+        corsHostWhiteList: ["localhost:3000"],
         endpoints: [],
         jsonLimit: "10mb",
+        projectName: "Application project",
         isProductionEnvironment: false,
         interceptor: undefined,
         postproducer: undefined,
         preproducer: undefined,
-        access: {},
-        monitor: undefined,
+        access: {
+            monitor: [],
+            documentation: []
+        },
         appVersion: undefined,
         fileTempDir: "/tmp",
         fileLimit: 10_000_000,
@@ -94,8 +93,7 @@ async function Initializer(services) {
 }
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
-    static nextLogID = 0;
-    version = "3.8.4";
+    version = "3.8.6";
     options;
     monitor = null;
     started = new Date();
@@ -109,7 +107,7 @@ class APIService extends BaseService_1.BaseService {
         const self = "http://localhost:" + this.options.port;
         if (!this.options.corsHostWhiteList.find(val => val === self))
             this.options.corsHostWhiteList.push();
-        exports.REQ_MONITOR_USERS.listener = async () => this.options.access.monitor ?? this.options.monitor ?? [];
+        exports.REQ_MONITOR_USERS.listener = async () => this.options.access.monitor ?? [];
         exports.REQ_DOC_USERS.listener = async () => this.options.access.documentation ?? [];
         this.options.endpoints.push(new Monitor_1.Monitor(this.options));
         this.options.endpoints.push(new Documentation_1.Documentation(this.options));
@@ -276,14 +274,12 @@ class APIService extends BaseService_1.BaseService {
                             if (!ignoreInterceptor) {
                                 let interceptorResult;
                                 if (this.options.interceptor) {
-                                    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, httpRequest);
                                         return;
                                     }
-                                    httpRequestBound.interceptorResult = interceptorResult;
-                                    httpRequest = httpRequestBound;
+                                    httpRequest.interceptorResult = interceptorResult;
                                 }
                             }
                             const precheck = await i.__precheck(httpRequest);
@@ -412,6 +408,10 @@ class APIService extends BaseService_1.BaseService {
                                 httpStatus: 500
                             }, requestTime, data.endpoint, req);
                         }
+                        else {
+                            if (req)
+                                this.addNetlog(data, req, requestTime, 0);
+                        }
                     });
                     return;
                 }
@@ -444,6 +444,8 @@ class APIService extends BaseService_1.BaseService {
                 console.error(e);
             }
         }
+        if (req)
+            this.addNetlog(data, req, requestTime, 0);
     }
     checkDataLength(data, result, lvl) {
         if (!lvl)

package/dist/apiServer/DBService.d.ts

@@ -9,6 +9,7 @@ export interface IDBQueryField {
     ignoreInUpdate?: boolean;
     useInReplace?: boolean;
     __parsedValue?: string | number | boolean | null | undefined;
+    fields?: Record<string, number | boolean | string | null>;
 }
 export interface IDBQueryFields {
     [key: string]: string | number | boolean | IDBQueryField | null;

package/dist/apiServer/db/MysqlAdapter.js

@@ -606,6 +606,14 @@ class MysqlAdapter {
         }
         if (typeof value === "boolean")
             value = value ? 1 : 0;
+        if (field.fields && typeof field.fields === "object" && value && typeof value === "string" && value.indexOf("@") !== -1) {
+            for (let key in field.fields) {
+                if (!field.fields[key])
+                    continue;
+                const val = promise_1.default.escape(field.fields[key]);
+                value = this.safeReplace(value, key, val);
+            }
+        }
         field.__parsedValue = value;
         if (field.__parsedValue === null || field.__parsedValue === undefined) {
             field.__parsedValue = "NULL";

package/package.json

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