badmfck-api-server 2.2.0 → 2.2.1

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

package/dist/apiServer/MysqlService.d.ts

@@ -20,6 +20,7 @@ export interface MysqlServiceOptions {
     database: string;
     queueLimit?: number;
     transactionFailReport?: (trx: ITransaction, message: string) => void;
+    transactionFailReportDir?: string;
     migrations?: {
         dir: string;
         callback: () => void;
@@ -84,6 +85,7 @@ export declare class MysqlService extends BaseService {
     constructor(options: MysqlServiceOptions);
     static executeQuery(query: MySqlQuery | MySqlQuery[]): Promise<MysqlResult[]>;
     init(): Promise<void>;
+    finishApp(): Promise<void>;
     storeTransactionAsProblem(trx: ITransaction, message: string): Promise<void>;
     recreatePool(): Promise<boolean>;
     onApplicationReady(): Promise<void>;

package/dist/apiServer/MysqlService.js

@@ -76,35 +76,30 @@ class MysqlService extends BaseService_1.BaseService {
                 return false;
             });
         }, 1000 * 30);
+        if (options.transactionFailReportDir) {
+            const fs = require('fs');
+            try {
+                if (!fs.existsSync(options.transactionFailReportDir)) {
+                    fs.mkdirSync(options.transactionFailReportDir);
+                }
+            }
+            catch (e) {
+                options.transactionFailReportDir = undefined;
+                (0, LogService_1.logCrit)("${MysqlService.js}", "Can't create transaction fail report dir");
+            }
+        }
     }
     static async executeQuery(query) { return await exports.REQ_MYSQL_QUERY.request(query); }
     async init() {
         super.init();
         process.on('SIGINT', async () => {
             console.log('1. Received SIGINT. Performing cleanup...');
-            for (let i of this.transactions) {
-                try {
-                    this.storeTransactionAsProblem(i, "SIGINT");
-                    i.conn.removeAllListeners();
-                    await i.conn.rollback();
-                    i.conn.release();
-                }
-                catch (e) {
-                    (0, LogService_1.logError)("Can't release transaction connection", e);
-                }
-            }
-            if (this.pool) {
-                try {
-                    await this.pool.end();
-                }
-                catch (e) {
-                    (0, LogService_1.logCrit)("${MysqlService.js}", "Can't close MYSQL pool!");
-                }
-            }
+            await this.finishApp();
             process.exit(0);
         });
-        process.on('SIGTERM', () => {
+        process.on('SIGTERM', async () => {
             console.log('2. Received SIGTERM. Performing cleanup...');
+            await this.finishApp();
             process.exit(0);
         });
         this.serviceStarted = false;
@@ -220,38 +215,74 @@ class MysqlService extends BaseService_1.BaseService {
             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;
+            const trx = {
+                id: MysqlService.nextTransactionID++,
+                timestamp: Date.now(),
+                conn: conn,
+                queries: []
+            };
             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]);
+                    const query = MysqlService.prepareQuery(i.query, i.fields);
+                    let err = null;
+                    try {
+                        const d = await conn.query(query);
+                        income.push(d[0]);
+                    }
+                    catch (e) {
+                        err = this.createMysqlQueryError(e);
+                    }
+                    trx.queries.push({
+                        sql: query,
+                        status: err ? err.message : "completed"
+                    });
+                    if (err)
+                        return { error: err, data: null };
                 }
-                await conn.commit();
-            }
-            catch (e) {
-                let rollbackError = null;
                 try {
-                    await conn.rollback();
+                    await conn.commit();
                 }
-                catch (e2) {
-                    (0, LogService_1.logCrit)("${MysqlService.js}", "Can't rollback transaction!");
-                    rollbackError = this.createMysqlQueryError(e2);
+                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);
+                    }
+                    return { error: this.createMysqlQueryError(e), data: null, rollbackError: rollbackError };
                 }
-                result = { error: this.createMysqlQueryError(e), data: null, rollbackError: rollbackError };
             }
+            catch (e) {
+                return { error: this.createMysqlQueryError(e), data: null };
+            }
+            return { error: null, data: income };
+        };
+    }
+    async finishApp() {
+        for (let i of this.transactions) {
+            try {
+                this.storeTransactionAsProblem(i, "SIGINT");
+                i.conn.removeAllListeners();
+                await i.conn.rollback();
+                i.conn.release();
+            }
+            catch (e) {
+                (0, LogService_1.logError)("Can't release transaction connection", e);
+            }
+        }
+        if (this.pool) {
             try {
-                conn.release();
+                await this.pool.end();
             }
             catch (e) {
-                (0, LogService_1.logCrit)("${MysqlService.js}", "Can't release connection!");
+                (0, LogService_1.logCrit)("${MysqlService.js}", "Can't close MYSQL pool!");
             }
-            if (!result)
-                result = { error: null, data: income };
-            return result;
-        };
+        }
     }
     async storeTransactionAsProblem(trx, message) {
         if (!this.options.transactionFailReport) {

package/package.json

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