badmfck-api-server 3.0.1 → 3.0.3

package/dist/apiServer/APIService.js

@@ -43,10 +43,10 @@ const os_1 = __importDefault(require("os"));
 const Liveness_1 = require("./routes/Liveness");
 const Readiness_1 = require("./routes/Readiness");
 const http_1 = __importDefault(require("http"));
-const MysqlService_1 = require("./MysqlService");
 const StatService_1 = require("./StatService");
 const ExternalServiceEndpoint_1 = require("./external/ExternalServiceEndpoint");
 const MonitorService_1 = require("./MonitorService");
+const MysqlAdapter_1 = require("./db/MysqlAdapter");
 function getDefaultOptions() {
     return {
         port: 8091,
@@ -57,7 +57,7 @@ function getDefaultOptions() {
         endpoints: [],
         jsonLimit: "10mb",
         onNetworkLog: function (log) {
-            (0, LogService_1.logInfo)("${APIService.js}", log);
+            (0, LogService_1.logAPI)("${APIService.js}", log);
         },
         onError: function (err) {
             (0, LogService_1.logError)("${APIService.js}", err);
@@ -89,7 +89,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "3.0.1";
+    version = "3.0.3";
     options;
     monitor = null;
     monitorIndexFile;
@@ -252,8 +252,10 @@ class APIService extends BaseService_1.BaseService {
                                     details = e.message;
                                     stack = [e];
                                 }
-                                if ((0, MysqlService_1.isMysqlError)(e))
-                                    details = e.message;
+                                if ((0, MysqlAdapter_1.isError)(e)) {
+                                    this.sendResponse(req.get("Referer") ?? "", res, { error: { ...DefaultErrors_1.default.DB_ERROR, details: e.message } }, tme, ep, log, httpRequest);
+                                    return;
+                                }
                                 this.sendResponse(req.get("Referer") ?? "", res, { error: { code: 10002, message: "Internal server error", stack: stack, details: details }, data: null, httpStatus: 500 }, tme, ep, log, httpRequest);
                                 return;
                             }
@@ -308,6 +310,11 @@ class APIService extends BaseService_1.BaseService {
                             };
                             if (DefaultErrors_1.ErrorUtils.isError(e))
                                 data = { error: e };
+                            if ((0, MysqlAdapter_1.isError)(e)) {
+                                data = {
+                                    error: { ...DefaultErrors_1.default.DB_ERROR, details: e.message }
+                                };
+                            }
                             this.sendResponse(req.get("Referer") ?? "", res, data, tme, ep, log, httpRequest);
                             return;
                         }

package/dist/apiServer/DBService.d.ts

@@ -21,16 +21,17 @@ export interface IDBQuery {
     calculateCount?: boolean;
     parseQueryOnly?: boolean;
 }
+export interface IDBBulkQueryItem {
+    query: string;
+    fields: {
+        [key: string]: IDBQueryField | null | string | number | boolean;
+    };
+    throwable?: boolean;
+    calculateCount?: boolean;
+}
 export interface IDBBulkQuery {
     dbid?: string;
-    bulk: {
-        query: string;
-        fields: {
-            [key: string]: IDBQueryField | null | string | number | boolean;
-        };
-        throwable?: boolean;
-        calculateCount?: boolean;
-    }[];
+    bulk: IDBBulkQueryItem[];
     queued?: boolean;
 }
 export interface IDBError {
@@ -65,12 +66,24 @@ export interface DBAdapterOptions {
 }
 export declare const REQ_DB: Req<IDBQuery, IDBResult>;
 export declare const REQ_DBX: Req<IDBBulkQuery, IDBResult[]>;
+export declare const REQ_DB_TBEGIN: Req<{
+    dbid: string;
+}, IDBResult>;
+export declare const REQ_DB_TCOMMIT: Req<{
+    dbid: string;
+    trxid: number;
+}, IDBResult>;
+export declare const REQ_DB_TROLLBACK: Req<{
+    dbid: string;
+    trxid: number;
+}, IDBResult>;
 export declare class DBService extends BaseService {
     static allInstances: DBService[];
     options: IDBSericeOptions;
     adapter: IDBAdapter | null;
     constructor(options: IDBSericeOptions);
     init(): Promise<void>;
+    getAdapter(dbid?: string | null): IDBAdapter | IDBError;
     finishService(): Promise<void>;
     createMysqlDatabase(): Promise<void>;
 }

package/dist/apiServer/DBService.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DBService = exports.REQ_DBX = exports.REQ_DB = void 0;
+exports.DBService = exports.REQ_DB_TROLLBACK = exports.REQ_DB_TCOMMIT = exports.REQ_DB_TBEGIN = exports.REQ_DBX = exports.REQ_DB = void 0;
 const badmfck_signal_1 = require("badmfck-signal");
 const BaseService_1 = require("./BaseService");
 const MysqlAdapter_1 = require("./db/MysqlAdapter");
 exports.REQ_DB = new badmfck_signal_1.Req(undefined, "REQ_DB");
 exports.REQ_DBX = new badmfck_signal_1.Req(undefined, "REQ_DBX");
+exports.REQ_DB_TBEGIN = new badmfck_signal_1.Req(undefined, "REQ_DB_TBEGIN");
+exports.REQ_DB_TCOMMIT = new badmfck_signal_1.Req(undefined, "REQ_DB_TBEGIN");
+exports.REQ_DB_TROLLBACK = new badmfck_signal_1.Req(undefined, "REQ_DB_TBEGIN");
 class DBService extends BaseService_1.BaseService {
     static allInstances = [];
     options;
@@ -49,6 +52,66 @@ class DBService extends BaseService_1.BaseService {
             }
             return result;
         };
+        exports.REQ_DB_TBEGIN.listener = async (req) => {
+            const adapter = this.getAdapter(req.dbid);
+            if ("errno" in adapter) {
+                return {
+                    error: adapter
+                };
+            }
+            if (adapter.tBegin && typeof adapter.tBegin === "function")
+                return await adapter.tBegin();
+            return {
+                error: {
+                    errno: -10,
+                    code: "TRX_NOT_SUPPORTED",
+                    fatal: true,
+                    sql: "START TRANSACTION",
+                    name: "TRX_NOT_SUPPORTED",
+                    message: "Transactions not supported on selected adapter"
+                }
+            };
+        };
+        exports.REQ_DB_TCOMMIT.listener = async (req) => {
+            const adapter = this.getAdapter(req.dbid);
+            if ("errno" in adapter) {
+                return {
+                    error: adapter
+                };
+            }
+            if (adapter.tCommit && typeof adapter.tCommit === "function")
+                return await adapter.tCommit(req.trxid);
+            return {
+                error: {
+                    errno: -10,
+                    code: "TRX_NOT_SUPPORTED",
+                    fatal: true,
+                    sql: "COMMIT",
+                    name: "TRX_NOT_SUPPORTED",
+                    message: "Transactions not supported on selected adapter"
+                }
+            };
+        };
+        exports.REQ_DB_TROLLBACK.listener = async (req) => {
+            const adapter = this.getAdapter(req.dbid);
+            if ("errno" in adapter) {
+                return {
+                    error: adapter
+                };
+            }
+            if (adapter.tRollback && typeof adapter.tRollback === "function")
+                return await adapter.tRollback(req.trxid);
+            return {
+                error: {
+                    errno: -10,
+                    code: "TRX_NOT_SUPPORTED",
+                    fatal: true,
+                    sql: "ROLLBACK",
+                    name: "TRX_NOT_SUPPORTED",
+                    message: "Transactions not supported on selected adapter"
+                }
+            };
+        };
         exports.REQ_DB.listener = async (req) => {
             if (!req.dbid && DBService.allInstances.length === 1 && DBService.allInstances[0].adapter)
                 return DBService.allInstances[0].adapter.query(req);
@@ -69,6 +132,23 @@ class DBService extends BaseService_1.BaseService {
             return { error: error };
         };
     }
+    getAdapter(dbid) {
+        if (!dbid && DBService.allInstances.length === 1 && DBService.allInstances[0].adapter)
+            return DBService.allInstances[0].adapter;
+        for (let i of DBService.allInstances) {
+            if (i.options.id === dbid && i.adapter)
+                return i.adapter;
+        }
+        const error = {
+            code: "DB_NOT_FOUND",
+            errno: -1,
+            fatal: true,
+            sql: "",
+            name: "DB_NOT_FOUND",
+            message: "DB not found: " + dbid
+        };
+        return error;
+    }
     async finishService() {
         await this.adapter?.finish();
     }

package/dist/apiServer/LogService.d.ts

@@ -1,11 +1,13 @@
 import Signal, { Req } from "badmfck-signal";
 import { BaseService } from "./BaseService";
 export declare enum LOG_LEVEL {
-    ALL = 0,
-    INFO = 1,
-    WARN = 2,
-    ERROR = 3,
-    CRIT = 4
+    ALL = 10,
+    API = 19,
+    INFO = 20,
+    DB = 25,
+    WARN = 30,
+    ERROR = 40,
+    CRIT = 50
 }
 export interface ILogItem {
     id: number;
@@ -27,6 +29,8 @@ export declare const logInfo: (message: any, ...optional: any[]) => void;
 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 logDB: (message: any, ...optional: any[]) => void;
+export declare const logAPI: (message: any, ...optional: any[]) => void;
 export declare const S_LOG: Signal<{
     level: LOG_LEVEL;
     data: any[];

package/dist/apiServer/LogService.js

@@ -23,16 +23,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogService = exports.REQ_LOG_UNIQUE_SERVICES = exports.REQ_LOG = exports.S_LOG_SET_TEXT_LIMIT = exports.S_LOG_REMOVE_SERVICE_FROM_WATCH = exports.S_LOG_ADD_SERVICE_TO_WATCH = 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;
+exports.LogService = exports.REQ_LOG_UNIQUE_SERVICES = exports.REQ_LOG = exports.S_LOG_SET_TEXT_LIMIT = exports.S_LOG_REMOVE_SERVICE_FROM_WATCH = exports.S_LOG_ADD_SERVICE_TO_WATCH = exports.S_LOG_FLUSH = exports.S_LOG_CHANGE_LEVEL = exports.S_LOG_CREATED = exports.S_LOG = exports.logAPI = exports.logDB = 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[LOG_LEVEL["ALL"] = 10] = "ALL";
+    LOG_LEVEL[LOG_LEVEL["API"] = 19] = "API";
+    LOG_LEVEL[LOG_LEVEL["INFO"] = 20] = "INFO";
+    LOG_LEVEL[LOG_LEVEL["DB"] = 25] = "DB";
+    LOG_LEVEL[LOG_LEVEL["WARN"] = 30] = "WARN";
+    LOG_LEVEL[LOG_LEVEL["ERROR"] = 40] = "ERROR";
+    LOG_LEVEL[LOG_LEVEL["CRIT"] = 50] = "CRIT";
 })(LOG_LEVEL || (exports.LOG_LEVEL = LOG_LEVEL = {}));
 const getDefaultLogOptions = () => {
     return {
@@ -50,6 +52,10 @@ const logCrit = (message, ...optional) => { exports.S_LOG.invoke({ level: LOG_LE
 exports.logCrit = logCrit;
 const logError = (message, ...optional) => { exports.S_LOG.invoke({ level: LOG_LEVEL.ERROR, data: [message, optional] }); };
 exports.logError = logError;
+const logDB = (message, ...optional) => { exports.S_LOG.invoke({ level: LOG_LEVEL.DB, data: [message, optional] }); };
+exports.logDB = logDB;
+const logAPI = (message, ...optional) => { exports.S_LOG.invoke({ level: LOG_LEVEL.API, data: [message, optional] }); };
+exports.logAPI = logAPI;
 exports.S_LOG = new badmfck_signal_1.default();
 exports.S_LOG_CREATED = new badmfck_signal_1.default();
 exports.S_LOG_CHANGE_LEVEL = new badmfck_signal_1.default();

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

@@ -2,6 +2,9 @@ import { IDBBulkQuery, IDBQuery, IDBResult } from "../DBService";
 export interface IDBAdapter {
     init(): Promise<void>;
     finish(): Promise<void>;
+    tBegin?(): Promise<IDBResult>;
+    tCommit?(trxid: number): Promise<IDBResult>;
+    tRollback?(trxid: number): Promise<IDBResult>;
     prepareQuery(request: IDBQuery): string;
     query(request: IDBQuery): Promise<IDBResult>;
     bulk(request: IDBBulkQuery): Promise<IDBResult[]>;

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

@@ -34,6 +34,9 @@ export declare class MysqlAdapter implements IDBAdapter {
     init(): Promise<void>;
     setupTimers(): void;
     recreatePool(): Promise<boolean>;
+    tBegin(): Promise<IDBResult>;
+    tCommit(trxid: number): Promise<IDBResult>;
+    tRollback(trxid: number): Promise<IDBResult>;
     bulk(request: IDBBulkQuery): Promise<IDBResult[]>;
     getConnection(transactionId?: number): Promise<mysql.PoolConnection | IDBError>;
     query(request: IDBQuery, conn?: mysql.PoolConnection): Promise<IDBResult>;
@@ -46,6 +49,6 @@ export declare class MysqlAdapter implements IDBAdapter {
     finish(): Promise<void>;
     createMysqlQueryError(err: any, throwable?: boolean): IDBError;
     storeTransactionAsProblem(trx: ITransaction, message: string): Promise<void>;
-    isError(obj: any): obj is IDBError;
 }
+export declare function isError(obj: any): obj is IDBError;
 export {};

package/dist/apiServer/db/MysqlAdapter.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlAdapter = void 0;
+exports.isError = exports.MysqlAdapter = void 0;
 const promise_1 = __importDefault(require("mysql2/promise"));
 const fs_1 = __importDefault(require("fs"));
 const LogService_1 = require("../LogService");
@@ -107,7 +107,7 @@ class MysqlAdapter {
             keepAliveInitialDelay: 3 * 1000,
             idleTimeout: 1000 * 60 * 5
         };
-        (0, LogService_1.logInfo)("${MysqlAdapter.js}", "Connecting to mysql: \n " + JSON.stringify({ ...opt, password: "****" }, null, "\t"));
+        (0, LogService_1.logDB)("${MysqlAdapter.js}", "Connecting to mysql: \n " + JSON.stringify({ ...opt, password: "****" }, null, "\t"));
         if (this.pool) {
             this.pool.removeAllListeners();
             try {
@@ -129,21 +129,21 @@ class MysqlAdapter {
         this.acquiredPoolConnections = 0;
         this.pool?.on('connection', (connection) => {
             if (this.options.debug)
-                (0, LogService_1.logInfo)("MysqlAdapter", "pool -> connection created, total:" + this.poolConnections++);
+                (0, LogService_1.logDB)("MysqlAdapter", "pool -> connection created, total:" + this.poolConnections++);
         });
         this.pool?.on('acquire', (connection) => {
             this.acquiredPoolConnections++;
             if (this.options.debug)
-                (0, LogService_1.logInfo)("MysqlAdapter", "pool -> connection acquire, busy:" + this.acquiredPoolConnections);
+                (0, LogService_1.logDB)("MysqlAdapter", "pool -> connection acquire, busy:" + this.acquiredPoolConnections);
         });
         this.pool?.on('release', (connection) => {
             this.acquiredPoolConnections--;
             if (this.options.debug)
-                (0, LogService_1.logInfo)("MysqlAdapter", "pool -> connection release, busy:" + this.acquiredPoolConnections);
+                (0, LogService_1.logDB)("MysqlAdapter", "pool -> connection release, busy:" + this.acquiredPoolConnections);
         });
         this.pool?.on('enqueue', () => {
             if (this.options.debug)
-                (0, LogService_1.logInfo)("MysqlAdapter", "pool -> waiting for available connection");
+                (0, LogService_1.logDB)("MysqlAdapter", "pool -> waiting for available connection");
         });
         if (this.options.debug)
             console.log("Check mysql connection");
@@ -154,13 +154,92 @@ class MysqlAdapter {
         }
         return true;
     }
+    async tBegin() {
+        const conn = await this.getConnection();
+        if (isError(conn))
+            return { error: conn };
+        for (let i of this.transactions) {
+            if (i.conn === conn) {
+                (0, LogService_1.logError)("Selected connection is in transaction");
+                return {
+                    error: {
+                        errno: 100005,
+                        code: "CONN_IN_TRX",
+                        fatal: true,
+                        sql: "START TRANSACTION",
+                        name: "CONN_IN_TRX",
+                        message: "Selected connection already in transaction"
+                    }
+                };
+            }
+        }
+        const trxid = MysqlAdapter.nextTransactionID++;
+        if (this.options.debug)
+            (0, LogService_1.logDB)("Begin transaction with id ", trxid);
+        const result = await this.query({ query: "START TRANSACTIONS" }, conn);
+        const trxRequest = {
+            id: trxid,
+            timestamp: Date.now(),
+            conn: conn,
+            queries: []
+        };
+        if (result.error) {
+            trxRequest.queries.push({ sql: "START TRANSACTION", status: "error" });
+            this.rollbackTransaction(trxRequest);
+            return result;
+        }
+        trxRequest.queries.push({ sql: "START TRANSACTION", status: "ok" });
+        this.transactions.push(trxRequest);
+        if (this.options.debug)
+            console.log("Transactions pool: ", this.transactions);
+        return { data: { transactionId: trxid } };
+    }
+    async tCommit(trxid) {
+        const trx = this.transactions.find(i => i.id === trxid);
+        if (!trx) {
+            return {
+                error: {
+                    code: "NO_TRX",
+                    errno: 100004,
+                    fatal: true,
+                    sql: "",
+                    name: "NO_TRX",
+                    message: "Transaction not found",
+                }
+            };
+        }
+        if (this.options.debug)
+            (0, LogService_1.logDB)("Commit transaction:", trx.id);
+        this.transactions = this.transactions.filter(i => i.id !== trxid);
+        if (this.options.debug)
+            (0, LogService_1.logDB)("Transaction pool:", this.transactions);
+        const err = await this.commit(trx);
+        if (err)
+            return { error: err };
+        return { data: true };
+    }
+    async tRollback(trxid) {
+        const trx = this.transactions.find(i => i.id === trxid);
+        if (!trx) {
+            return { error: {
+                    code: "NO_TRX",
+                    errno: 100004,
+                    fatal: true,
+                    sql: "",
+                    name: "NO_TRX",
+                    message: "Transaction not found"
+                } };
+        }
+        await this.rollbackTransaction(trx);
+        return { data: true };
+    }
     async bulk(request) {
         const results = [];
         let queries = [];
         let conn = null;
         if (request.queued) {
             conn = await this.getConnection();
-            if (this.isError(conn)) {
+            if (isError(conn)) {
                 for (let i of request.bulk)
                     results.push({ data: null, error: conn });
                 return results;
@@ -210,15 +289,15 @@ class MysqlAdapter {
             if (transactionId && transactionId > 0) {
                 conn = this.transactions.find(i => i.id === transactionId)?.conn ?? null;
                 if (this.options.debug)
-                    console.log("Execute query on transaction: ", conn?.threadId);
+                    (0, LogService_1.logDB)("Execute query on transaction: ", conn?.threadId);
             }
             else
                 conn = await this.pool.getConnection();
             if (this.options.debug) {
-                console.log("Pool status: ", this.poolConnections, this.acquiredPoolConnections);
+                (0, LogService_1.logDB)("Pool status: ", this.poolConnections, this.acquiredPoolConnections);
             }
             if (this.options.debug)
-                console.log("Execute query", conn?.threadId);
+                (0, LogService_1.logDB)("Execute query", conn?.threadId);
             if (conn)
                 return conn;
         }
@@ -248,7 +327,7 @@ class MysqlAdapter {
         if (!conn) {
             doCloseConnection = true;
             conn = await this.getConnection(request.transactionID ?? -1);
-            if (this.isError(conn)) {
+            if (isError(conn)) {
                 return {
                     data: null,
                     error: conn,
@@ -478,25 +557,26 @@ class MysqlAdapter {
                 this.failReportFileStreamName = file;
             }
             if (this.options.debug)
-                console.log("Store transaction fail report: ", file, trx.queries, message);
+                (0, LogService_1.logDB)("Store transaction fail report: ", file, trx.queries, message);
             if (!this.failReportFileStream)
                 this.failReportFileStream = fs_1.default.createWriteStream(file, { flags: 'a' });
             this.failReportFileStream.write(JSON.stringify({ queries: trx.queries, time: trx.timestamp, date, message }) + "\n}EOB{\n", err => {
                 if (err)
                     (0, LogService_1.logCrit)("MysqlAdapter", "Can't write to transaction fail report file");
                 else
-                    (0, LogService_1.logInfo)("MysqlAdapter", "Transaction fail report stored");
+                    (0, LogService_1.logDB)("MysqlAdapter", "Transaction fail report stored");
             });
             this.failReportLastAccessTime = Date.now();
         }
         if (this.options.transactionFailReport)
             this.options.transactionFailReport(trx, message);
     }
-    isError(obj) {
-        return obj && "code" in obj && "errno" in obj && "name" in obj && "message" in obj;
-    }
 }
 exports.MysqlAdapter = MysqlAdapter;
+function isError(obj) {
+    return obj && "code" in obj && "errno" in obj && "name" in obj && "message" in obj;
+}
+exports.isError = isError;
 const secret_key = "AKLWkajw%^&dgwqhw#98453i23bfk23rn2knknglrgjeit";
 const secret_iv = "rthadrfk23rn2kn#*FNKA@gt44df3tslrgj##!it";
 const key = (0, crypto_1.createHash)('sha512').update(secret_key).digest('hex').substring(0, 32);

package/dist/apiServer/external/ExternalService.js

@@ -45,7 +45,7 @@ exports.REQ_XT.listener = async ({ id, req }) => {
         if (i.options.id === id)
             return await i.onExternalCall(req);
     }
-    return { error: { ...DefaultErrors_1.default.BAD_REQUEST, details: "no external service found" } };
+    return { error: { ...DefaultErrors_1.default.BAD_REQUEST, details: "no external service found: " + id } };
 };
 exports.REQ_EXTERNAL_CALL.listener = async ({ id, requestName, requestData }) => {
     if (ExternalService.allInstances.length === 0) {
@@ -56,7 +56,7 @@ exports.REQ_EXTERNAL_CALL.listener = async ({ id, requestName, requestData }) =>
         if (i.options.id === id)
             return await i.requestExternalCall({ id, requestName, requestData });
     }
-    return { ...DefaultErrors_1.default.BAD_REQUEST, details: "no external service found" };
+    return { ...DefaultErrors_1.default.BAD_REQUEST, details: "no external service found: " + id + ", requestName:" + requestName, stack: [requestData] };
 };
 class ExternalService extends BaseService_1.BaseService {
     static allInstances = [];
@@ -65,7 +65,7 @@ class ExternalService extends BaseService_1.BaseService {
         super("ExternalService-" + opt.id);
         for (let i of ExternalService.allInstances) {
             if (i.options.id === opt.id)
-                throw { code: -1, message: "duplicate id" };
+                throw { code: -1, message: "ExternalService, duplicate id: " + i.options.id };
         }
         ExternalService.allInstances.push(this);
         this.options = opt;

package/dist/apiServer/helper/Validator.js

@@ -45,7 +45,12 @@ class Validator {
             return result;
         }
         let errors = [];
+        let foundKeys = [];
         for (let i in structure) {
+            if (structure[i] === null) {
+                foundKeys.push(i);
+                continue;
+            }
             if (!(i in object))
                 errors.push("no field '" + i + "'");
             if (typeof structure[i] === "number" && typeof object[i] === "string") {
@@ -110,6 +115,7 @@ class Validator {
                     }
                 }
             }
+            foundKeys.push(i);
         }
         if (errors.length > 0)
             return errors;

package/dist/apiServer/structures/DefaultErrors.js

@@ -14,7 +14,7 @@ class DefaultErrors {
     static SERVICE_NOT_WORKING = { code: 8, message: "Service not working" };
     static TIMEOUT = { code: 9, message: "Timeout" };
     static METHOD_NOT_ALLOWED = { code: 10, message: "Method not allowed", httpStatus: 405 };
-    static DB_ERROR = { code: 11, message: "DB error" };
+    static DB_ERROR = { code: 11, message: "DB error", httpStatus: 500 };
 }
 class ErrorUtils {
     static isError(obj) {

package/package.json

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