badmfck-api-server 2.1.4 → 2.1.6

package/dist/apiServer/APIService.js

@@ -83,7 +83,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "2.1.4";
+    version = "2.1.5";
     options;
     monitor;
     monitorIndexFile;

package/dist/apiServer/MysqlService.d.ts

@@ -3,6 +3,7 @@ import Signal, { Req } from "badmfck-signal";
 import * as mysql from "mysql2/promise";
 export declare const S_MYSQL_STARTED: Signal<void>;
 export declare const REQ_MYSQL_QUERY: Req<MySqlQuery | MySqlQuery[], MysqlResult[]>;
+export declare const REQ_MYSQL_TRANSACTION: Req<MySqlQuery[], MysqlResult>;
 export declare const executeQuery: (query: MySqlQuery | MySqlQuery[]) => Promise<MysqlResult[]>;
 export interface MysqlServiceOptions {
     connectionLimit: number;
@@ -76,5 +77,6 @@ export declare class MysqlService extends BaseService {
         err: MysqlError | null;
         results?: any;
     }>;
+    createMysqlQueryError(err: any): MysqlError;
 }
 export default MysqlService;

package/dist/apiServer/MysqlService.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlService = exports.executeQuery = exports.REQ_MYSQL_QUERY = exports.S_MYSQL_STARTED = void 0;
+exports.MysqlService = exports.executeQuery = exports.REQ_MYSQL_TRANSACTION = exports.REQ_MYSQL_QUERY = exports.S_MYSQL_STARTED = void 0;
 const BaseService_1 = require("./BaseService");
 const badmfck_signal_1 = __importStar(require("badmfck-signal"));
 const crypto_1 = require("crypto");
@@ -31,6 +31,7 @@ const LogService_1 = require("./LogService");
 const mysql = __importStar(require("mysql2/promise"));
 exports.S_MYSQL_STARTED = new badmfck_signal_1.default();
 exports.REQ_MYSQL_QUERY = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_QUERY");
+exports.REQ_MYSQL_TRANSACTION = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TRANSACTION");
 const executeQuery = async (query) => { return await exports.REQ_MYSQL_QUERY.request(query); };
 exports.executeQuery = executeQuery;
 class MysqlService extends BaseService_1.BaseService {
@@ -92,6 +93,42 @@ class MysqlService extends BaseService_1.BaseService {
             }
             return await Promise.all(promises);
         };
+        exports.REQ_MYSQL_TRANSACTION.listener = async (data) => {
+            if (!this.pool)
+                return { error: { code: "NO_POOL", errno: 100000, fatal: true, sql: "", name: "NO_POOL", message: "Mysql pool not created" }, data: null };
+            const conn = await this.pool.getConnection();
+            if (!conn)
+                return { error: { code: "NO_CONN", errno: 100001, fatal: true, sql: "", name: "NO_CONN", message: "Mysql pool cant get connection" }, data: null };
+            let result = null;
+            let income = [];
+            try {
+                await conn.beginTransaction();
+                await conn.query("SET autocommit=0");
+                for (let i of data) {
+                    const d = await conn.query(MysqlService.prepareQuery(i.query, i.fields));
+                    income.push(d[0]);
+                }
+                await conn.commit();
+            }
+            catch (e) {
+                let rollbackError = null;
+                try {
+                    await conn.rollback();
+                }
+                catch (e2) {
+                    (0, LogService_1.logCrit)("${MysqlService.js}", "Can't rollback transaction!");
+                    rollbackError = this.createMysqlQueryError(e2);
+                }
+                result = { error: this.createMysqlQueryError(e), data: null, rollbackError: rollbackError };
+            }
+            try {
+                conn.release();
+            }
+            catch (e) { }
+            if (!result)
+                result = { error: null, data: income };
+            return result;
+        };
     }
     async recreatePool() {
         (0, LogService_1.logInfo)("${MysqlService.js}", "Connecting to mysql: \n HOST: " + this.options.host + '\n PORT:' + this.options.port);
@@ -380,34 +417,34 @@ class MysqlService extends BaseService_1.BaseService {
     }
     async queryAsync(conn, query) {
         try {
-            const result = await conn.query(query);
+            const result = await conn.execute(query);
             return {
                 err: null,
                 results: result[0],
             };
         }
         catch (e) {
-            const err = e;
-            if (err && typeof err === "object" && "code" in err && "errno" in err && "sql" in err && "name" in err && "message" in err) {
-                return {
-                    err: {
-                        code: err.code,
-                        errno: err.errno,
-                        sql: query,
-                        name: err.name,
-                        message: err.message
-                    }
-                };
-            }
+            return { err: this.createMysqlQueryError(e) };
+        }
+    }
+    createMysqlQueryError(err) {
+        if (err && typeof err === "object" && "code" in err && "errno" in err && "sql" in err && "name" in err && "message" in err) {
             return {
-                err: {
-                    code: "QUERY_ERR",
-                    errno: 100002,
-                    fatal: true,
-                    sql: query,
-                    name: "QUERY_ERR",
-                    message: "Error: " + e
-                }
+                code: err.code,
+                errno: err.errno,
+                sql: err.sql,
+                name: err.name,
+                message: err.message
+            };
+        }
+        else {
+            return {
+                code: "QUERY_ERR",
+                errno: 100002,
+                fatal: true,
+                sql: "no query",
+                name: "QUERY_ERR",
+                message: "Error: " + (err) ? err : ""
             };
         }
     }

package/package.json

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