badmfck-api-server 3.3.7 → 3.3.8

package/dist/apiServer/APIService.js

@@ -95,7 +95,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "3.3.7";
+    version = "3.3.8";
     options;
     monitor = null;
     started = new Date();

package/dist/apiServer/DBService.d.ts

@@ -42,6 +42,7 @@ export interface IDBError {
     sql: string;
     name: string;
     message: string;
+    isDuplicateError: boolean;
 }
 export interface IDBResult {
     data?: any | null;

package/dist/apiServer/DBService.js

@@ -42,7 +42,8 @@ class DBService extends BaseService_1.BaseService {
                 fatal: true,
                 sql: "",
                 name: "DB_NOT_FOUND",
-                message: "DB not found: " + req.dbid
+                message: "DB not found: " + req.dbid,
+                isDuplicateError: false
             };
             let result = [];
             for (let i of req.bulk) {
@@ -68,7 +69,8 @@ class DBService extends BaseService_1.BaseService {
                     fatal: true,
                     sql: "START TRANSACTION",
                     name: "TRX_NOT_SUPPORTED",
-                    message: "Transactions not supported on selected adapter"
+                    message: "Transactions not supported on selected adapter",
+                    isDuplicateError: false
                 }
             };
         };
@@ -88,7 +90,8 @@ class DBService extends BaseService_1.BaseService {
                     fatal: true,
                     sql: "COMMIT",
                     name: "TRX_NOT_SUPPORTED",
-                    message: "Transactions not supported on selected adapter"
+                    message: "Transactions not supported on selected adapter",
+                    isDuplicateError: false
                 }
             };
         };
@@ -108,7 +111,8 @@ class DBService extends BaseService_1.BaseService {
                     fatal: true,
                     sql: "ROLLBACK",
                     name: "TRX_NOT_SUPPORTED",
-                    message: "Transactions not supported on selected adapter"
+                    message: "Transactions not supported on selected adapter",
+                    isDuplicateError: false
                 }
             };
         };
@@ -125,7 +129,8 @@ class DBService extends BaseService_1.BaseService {
                 fatal: true,
                 sql: "",
                 name: "DB_NOT_FOUND",
-                message: "DB not found: " + req.dbid
+                message: "DB not found: " + req.dbid,
+                isDuplicateError: false
             };
             if (req.throwable)
                 throw error;
@@ -145,7 +150,8 @@ class DBService extends BaseService_1.BaseService {
             fatal: true,
             sql: "",
             name: "DB_NOT_FOUND",
-            message: "DB not found: " + dbid
+            message: "DB not found: " + dbid,
+            isDuplicateError: false
         };
         return error;
     }

package/dist/apiServer/db/MysqlAdapter.js

@@ -168,7 +168,8 @@ class MysqlAdapter {
                         fatal: true,
                         sql: "START TRANSACTION",
                         name: "CONN_IN_TRX",
-                        message: "Selected connection already in transaction"
+                        message: "Selected connection already in transaction",
+                        isDuplicateError: false
                     }
                 };
             }
@@ -205,6 +206,7 @@ class MysqlAdapter {
                     sql: "",
                     name: "NO_TRX",
                     message: "Transaction not found",
+                    isDuplicateError: false
                 }
             };
         }
@@ -227,7 +229,8 @@ class MysqlAdapter {
                     fatal: true,
                     sql: "",
                     name: "NO_TRX",
-                    message: "Transaction not found"
+                    message: "Transaction not found",
+                    isDuplicateError: false
                 } };
         }
         await this.rollbackTransaction(trx);
@@ -282,6 +285,7 @@ class MysqlAdapter {
                 sql: "",
                 name: "NO_POOL",
                 message: "Mysql pool not created",
+                isDuplicateError: false
             };
         }
         try {
@@ -313,6 +317,7 @@ class MysqlAdapter {
             sql: "",
             name: "NO_CONN",
             message: "Mysql pool cant get connection",
+            isDuplicateError: false
         };
     }
     async query(request, conn) {
@@ -525,7 +530,8 @@ class MysqlAdapter {
                 sql: err.sql,
                 name: err.name,
                 message: err.message,
-                fatal: false
+                fatal: false,
+                isDuplicateError: err.code === "ER_DUP_ENTRY"
             };
         }
         else {
@@ -536,6 +542,7 @@ class MysqlAdapter {
                 sql: "no query",
                 name: "QUERY_ERR",
                 message: "Error: " + (err) ? err : "",
+                isDuplicateError: false
             };
         }
     }

package/dist/apiServer/helper/Validator.js

@@ -130,7 +130,7 @@ class Validator {
                 const regex = structure["$__" + i + "_regex"];
                 const reg = new RegExp(regex);
                 if (reg.test(object[i]) === false)
-                    errors.push("wrong value for field '" + i + "', false mask for: " + object[i]);
+                    errors.push("wrong value for field '" + i + "', false mask for: >" + object[i] + "<");
             }
             if (typeof structure[i] === "string" && (structure[i] === "@" || structure[i] === "email")) {
                 const value = object[i].toString().toLowerCase().trim();

package/package.json

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