badmfck-api-server 2.2.9 → 2.3.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.9";
+    version = "2.3.1";
     options;
     monitor;
     monitorIndexFile;

package/dist/apiServer/MysqlService.d.ts

@@ -24,6 +24,7 @@ export interface MysqlServiceOptions {
     queueLimit?: number;
     transactionFailReport?: (trx: ITransaction, message: string) => void;
     transactionFailReportDir?: string;
+    debug?: boolean;
     migrations?: {
         dir: string;
         callback: () => void;
@@ -82,6 +83,7 @@ export declare class MysqlService extends BaseService {
     options: MysqlServiceOptions;
     serviceStarted: boolean;
     timeoutID: any;
+    debug: boolean;
     queries: never[];
     static nextTransactionID: number;
     transactions: ITransaction[];

package/dist/apiServer/MysqlService.js

@@ -50,6 +50,7 @@ class MysqlService extends BaseService_1.BaseService {
     options;
     serviceStarted = false;
     timeoutID;
+    debug = false;
     queries = [];
     static nextTransactionID = 0;
     transactions = [];
@@ -68,6 +69,8 @@ class MysqlService extends BaseService_1.BaseService {
             this.options.database = decrypt(this.options.database.substring(1)) ?? this.options.database;
         if (this.options.password.startsWith("_"))
             this.options.password = decrypt(this.options.password.substring(1)) ?? this.options.password;
+        if (this.options.debug)
+            this.debug = true;
         setInterval(() => {
             const now = Date.now();
             this.transactions = this.transactions.filter(async (i) => {
@@ -109,12 +112,10 @@ class MysqlService extends BaseService_1.BaseService {
     async init() {
         super.init();
         process.on('SIGINT', async () => {
-            console.log('1. Received SIGINT. Performing cleanup...');
             await this.finishApp();
             process.exit(0);
         });
         process.on('SIGTERM', async () => {
-            console.log('2. Received SIGTERM. Performing cleanup...');
             await this.finishApp();
             process.exit(0);
         });
@@ -136,6 +137,8 @@ class MysqlService extends BaseService_1.BaseService {
                 const query = MysqlService.prepareQuery(i.query, i.fields);
                 promises.push(this.execute(query, i.rollbackQuery ?? null, i.transactionID ?? 0));
             }
+            if (this.debug)
+                console.log("Execute queries: ", data);
             return await Promise.all(promises);
         };
         exports.REQ_MYSQL_TBEGIN.listener = async () => {
@@ -143,12 +146,18 @@ class MysqlService extends BaseService_1.BaseService {
             if (!conn)
                 return { code: "NO_POOL", errno: 100000, fatal: true, sql: "", name: "NO_POOL", message: "Mysql pool not created" };
             const tid = MysqlService.nextTransactionID++;
+            if (this.debug)
+                console.log("Begin transaction with id ", tid);
             try {
                 await conn.beginTransaction();
-                await conn.query("SET autocommit=0");
+                const res = await conn.query("SET autocommit=0");
+                if (this.debug)
+                    console.log("Transaction started, SET autocommit=0 ", tid, res);
             }
             catch (e) {
                 try {
+                    if (this.debug)
+                        console.log("Transaction failed to start ", tid, e);
                     conn.removeAllListeners();
                     await conn.rollback();
                     conn.release();
@@ -162,6 +171,8 @@ class MysqlService extends BaseService_1.BaseService {
                 conn: conn,
                 queries: []
             });
+            if (this.debug)
+                console.log("Transactions pool: ", this.transactions);
             return tid;
         };
         exports.REQ_MYSQL_TQUERY.listener = async (data) => {
@@ -179,6 +190,8 @@ class MysqlService extends BaseService_1.BaseService {
             let err = null;
             let rollbackError = null;
             let sqlData = null;
+            if (this.debug)
+                console.log("Execute query on transaction: ", trx);
             try {
                 sqlData = await trx.conn.query(query);
             }
@@ -197,6 +210,8 @@ class MysqlService extends BaseService_1.BaseService {
                     rollbackError = this.createMysqlQueryError(e);
                 }
             }
+            if (this.debug)
+                console.log("Query execution status:", err ? err.message : "completed");
             trx.queries.push({ sql: query, status: err ? err.message : "completed" });
             return {
                 data: sqlData,
@@ -216,12 +231,17 @@ class MysqlService extends BaseService_1.BaseService {
                     message: "Transaction not found"
                 };
             }
+            if (this.debug)
+                console.log("Rollback transaction:", trx);
             this.transactions = this.transactions.filter(i => i.id !== tid);
+            if (this.debug)
+                console.log("Transaction pool:", this.transactions);
             try {
                 await trx.conn.rollback();
                 trx.conn.removeAllListeners();
                 trx.conn.release();
-                trx.conn.end();
+                if (this.debug)
+                    console.log("Rollback complete");
             }
             catch (e) {
                 (0, LogService_1.logError)("Can't rollback transaction");
@@ -231,7 +251,7 @@ class MysqlService extends BaseService_1.BaseService {
         };
         exports.REQ_MYSQL_TCOMMIT.listener = async (tid) => {
             const trx = this.transactions.find(i => i.id === tid);
-            if (!trx)
+            if (!trx) {
                 return {
                     code: "NO_TRX",
                     errno: 100004,
@@ -240,15 +260,24 @@ class MysqlService extends BaseService_1.BaseService {
                     name: "NO_TRX",
                     message: "Transaction not found"
                 };
+            }
+            if (this.debug)
+                console.log("Commit transaction:", trx);
             this.transactions = this.transactions.filter(i => i.id !== tid);
+            if (this.debug)
+                console.log("Transaction pool:", this.transactions);
             try {
                 await trx.conn.commit();
                 trx.conn.removeAllListeners();
                 trx.conn.release();
+                if (this.debug)
+                    console.log("Commit completed:");
             }
             catch (e) {
                 this.storeTransactionAsProblem(trx, "Can't commit transaction");
                 try {
+                    if (this.debug)
+                        console.log("Commit error, try rollback");
                     trx.conn.removeAllListeners();
                     await trx.conn.rollback();
                     trx.conn.release();
@@ -264,6 +293,7 @@ class MysqlService extends BaseService_1.BaseService {
             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();
+            (0, LogService_1.logCrit)("${MysqlService.js}", "REQ_MYSQL_TRANSACTION deprecated, use REQ_MYSQL_TBEGIN, REQ_MYSQL_TQUERY, REQ_MYSQL_TCOMMIT, REQ_MYSQL_TROLLBACK");
             if (!conn)
                 return { error: { code: "NO_CONN", errno: 100001, fatal: true, sql: "", name: "NO_CONN", message: "Mysql pool cant get connection" }, data: null };
             const trx = {
@@ -321,6 +351,7 @@ class MysqlService extends BaseService_1.BaseService {
         };
     }
     async finishApp() {
+        console.log("Finishing mysql service");
         for (let i of this.transactions) {
             try {
                 this.storeTransactionAsProblem(i, "SIGINT");
@@ -364,9 +395,13 @@ class MysqlService extends BaseService_1.BaseService {
                 this.failReportFileStream = fs_1.default.createWriteStream(file, { flags: 'a' });
                 this.failReportFileStreamName = file;
             }
+            if (this.debug)
+                console.log("Store transaction fail report: ", file, trx, message);
             this.failReportFileStream?.write(JSON.stringify({ trx, date, message }) + "\n{'s':'&$5__1AzZa'}\n", err => {
                 if (err)
                     (0, LogService_1.logCrit)("${MysqlService.js}", "Can't write to transaction fail report file");
+                else
+                    (0, LogService_1.logInfo)("${MysqlService.js}", "Transaction fail report stored");
             });
             this.failReportLastAccessTime = Date.now();
         }
@@ -413,11 +448,14 @@ class MysqlService extends BaseService_1.BaseService {
         this.pool?.on('enqueue', () => {
             (0, LogService_1.logInfo)("${MysqlService.js}", "MYSQL CONNECTION ENQUEUED");
         });
+        if (this.debug)
+            console.log("Check mysql connection");
         return new Promise(async (resolve, reject) => {
             try {
                 const conn = await this.pool?.getConnection();
                 if (conn) {
                     conn?.release();
+                    (0, LogService_1.logInfo)("${MysqlService.js}", "Connected to MYSQL!");
                     resolve(true);
                 }
                 else
@@ -569,10 +607,14 @@ class MysqlService extends BaseService_1.BaseService {
                 let conn = null;
                 if (transactionID && transactionID > 0) {
                     conn = this.transactions.find(i => i.id === transactionID)?.conn ?? null;
+                    if (this.debug)
+                        console.log("Execute query on transaction: ", conn);
                 }
                 else {
                     conn = await this.pool.getConnection();
                 }
+                if (this.debug)
+                    console.log("Execute query", conn);
                 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.9",
+  "version": "2.3.1",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",