badmfck-api-server 2.2.2 → 2.2.3

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.2.2";
+    version = "2.2.3";
     options;
     monitor;
     monitorIndexFile;

package/dist/apiServer/MysqlService.d.ts

@@ -11,7 +11,8 @@ export declare const REQ_MYSQL_TQUERY: Req<{
     query: MySqlQuery;
     tid: number;
 }, MysqlResult>;
-export declare const REQ_MYSQL_TEND: Req<number, MysqlError | null>;
+export declare const REQ_MYSQL_TCOMMIT: Req<number, MysqlError | null>;
+export declare const REQ_MYSQL_TROLLBACK: Req<number, MysqlError | null>;
 export declare const executeQuery: (query: MySqlQuery | MySqlQuery[]) => Promise<MysqlResult[]>;
 export interface MysqlServiceOptions {
     connectionLimit: number;
@@ -46,6 +47,7 @@ export interface MySqlQuery {
     query: string;
     fields: MysqlQueryField[] | MysqlQueryFieldObject;
     rollbackQuery?: string | null;
+    transactionID: number;
 }
 export interface MysqlQueryField {
     name: string;
@@ -98,7 +100,7 @@ export declare class MysqlService extends BaseService {
     static objectToFields(obj: MysqlQueryFieldObject | MysqlQueryField[]): MysqlQueryField[];
     static prepareQuery(query: string, fields: MysqlQueryField[] | MysqlQueryFieldObject): string;
     static prepareQueryFieldValue(value: string | number | boolean | null | undefined, system?: boolean): string | number | boolean | null | undefined;
-    execute(query: string, rollbackQuery: string | null): Promise<MysqlResult>;
+    execute(query: string, rollbackQuery: string | null, transactionID: number): Promise<MysqlResult>;
     sendQuery(conn: mysql.PoolConnection, query: string, resolve: (data: MysqlResult) => void, rollback: string | null): Promise<void>;
     queryAsync(conn: mysql.PoolConnection, query: string): Promise<{
         err: MysqlError | null;

package/dist/apiServer/MysqlService.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlService = exports.executeQuery = exports.REQ_MYSQL_TEND = exports.REQ_MYSQL_TQUERY = exports.REQ_MYSQL_TBEGIN = exports.REQ_MYSQL_TRANSACTION = exports.REQ_MYSQL_QUERY = exports.S_MYSQL_STARTED = void 0;
+exports.MysqlService = exports.executeQuery = exports.REQ_MYSQL_TROLLBACK = exports.REQ_MYSQL_TCOMMIT = exports.REQ_MYSQL_TQUERY = exports.REQ_MYSQL_TBEGIN = 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");
@@ -39,7 +39,8 @@ 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");
 exports.REQ_MYSQL_TBEGIN = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TRANSACTION_BEGING");
 exports.REQ_MYSQL_TQUERY = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TRANSACTION_ADD_OPERATION");
-exports.REQ_MYSQL_TEND = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TRANSACTION_END");
+exports.REQ_MYSQL_TCOMMIT = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TCOMMIT");
+exports.REQ_MYSQL_TROLLBACK = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TROLLBACK");
 const executeQuery = async (query) => { return await exports.REQ_MYSQL_QUERY.request(query); };
 exports.executeQuery = executeQuery;
 class MysqlService extends BaseService_1.BaseService {
@@ -133,7 +134,7 @@ class MysqlService extends BaseService_1.BaseService {
             const promises = [];
             for (let i of data) {
                 const query = MysqlService.prepareQuery(i.query, i.fields);
-                promises.push(this.execute(query, i.rollbackQuery ?? null));
+                promises.push(this.execute(query, i.rollbackQuery ?? null, i.transactionID));
             }
             return await Promise.all(promises);
         };
@@ -201,7 +202,30 @@ class MysqlService extends BaseService_1.BaseService {
                 rollbackError: rollbackError
             };
         };
-        exports.REQ_MYSQL_TEND.listener = async (tid) => {
+        exports.REQ_MYSQL_TROLLBACK.listener = async (tid) => {
+            const trx = this.transactions.find(i => i.id === tid);
+            if (!trx)
+                return {
+                    code: "NO_TRX",
+                    errno: 100004,
+                    fatal: true,
+                    sql: "",
+                    name: "NO_TRX",
+                    message: "Transaction not found"
+                };
+            this.transactions = this.transactions.filter(i => i.id !== tid);
+            try {
+                await trx.conn.rollback();
+                trx.conn.removeAllListeners();
+                trx.conn.release();
+            }
+            catch (e) {
+                (0, LogService_1.logError)("Can't rollback transaction");
+                return this.createMysqlQueryError(e);
+            }
+            return null;
+        };
+        exports.REQ_MYSQL_TCOMMIT.listener = async (tid) => {
             const trx = this.transactions.find(i => i.id === tid);
             if (!trx)
                 return {
@@ -220,6 +244,14 @@ class MysqlService extends BaseService_1.BaseService {
             }
             catch (e) {
                 this.storeTransactionAsProblem(trx, "Can't commit transaction");
+                try {
+                    trx.conn.removeAllListeners();
+                    await trx.conn.rollback();
+                    trx.conn.release();
+                }
+                catch (e) {
+                    (0, LogService_1.logError)("Can't rollback transaction");
+                }
                 return this.createMysqlQueryError(e);
             }
             return null;
@@ -511,7 +543,7 @@ class MysqlService extends BaseService_1.BaseService {
             return "NULL";
         return value;
     }
-    async execute(query, rollbackQuery) {
+    async execute(query, rollbackQuery, transactionID) {
         return new Promise(async (resolve, reject) => {
             if (!this.pool) {
                 (0, LogService_1.logError)("${MysqlService.js}", "No pool");
@@ -529,7 +561,13 @@ class MysqlService extends BaseService_1.BaseService {
                 return;
             }
             try {
-                const conn = await this.pool.getConnection();
+                let conn = null;
+                if (transactionID && transactionID > 0) {
+                    conn = this.transactions.find(i => i.id === transactionID)?.conn ?? null;
+                }
+                else {
+                    conn = await this.pool.getConnection();
+                }
                 if (!conn) {
                     (0, LogService_1.logCrit)("${MysqlService.js}", `No connection created!`);
                     resolve({

package/package.json

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