badmfck-api-server 3.8.7 → 3.8.9

package/dist/apiServer/APIService.js

@@ -93,7 +93,7 @@ async function Initializer(services) {
 }
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
-    version = "3.8.7";
+    version = "3.8.9";
     options;
     monitor = null;
     started = new Date();

package/dist/apiServer/db/MysqlAdapter.js

@@ -242,7 +242,6 @@ class MysqlAdapter {
         }
         if (this.options.debug)
             (0, LogService_1.logDB)("Commit transaction:", trx.id);
-        this.transactions = this.transactions.filter(i => i.id !== trxid);
         if (this.options.debug)
             (0, LogService_1.logDB)("Transaction pool:", this.transactions);
         const err = await this.commit(trx);
@@ -439,15 +438,20 @@ class MysqlAdapter {
                 };
             }
         }
+        let trx = null;
+        if (request.transactionID)
+            trx = this.transactions.find(i => i.id === request.transactionID);
         try {
             let result = null;
             if (this.options.maxQueryTimeout && this.options.maxQueryTimeout > 0)
-                result = await this.withTimeout(conn.query(query), this.options.maxQueryTimeout ?? 1000 * 25, query);
+                result = await this.withTimeout(conn.query(query), this.options.maxQueryTimeout, query);
             else
                 result = await conn.query(query);
             this.lastSuccessQueryTime = +new Date();
             if (!request.transactionID && doCloseConnection)
                 this.finalizeConnection(conn);
+            if (trx)
+                trx.queries.push({ sql: query, status: "ok" });
             return {
                 data: result[0],
                 error: null,
@@ -469,10 +473,14 @@ class MysqlAdapter {
                 this.finalizeConnection(conn);
             }
             const error = this.createMysqlQueryError(e);
+            if (trx)
+                trx.queries.push({ sql: query, status: error.code });
             if (`${e}`.indexOf('ECONNREFUSED') !== -1 || `${e}`.indexOf("PROTOCOL_") !== -1 || error.message.includes("closed state")) {
                 (0, LogService_1.logError)("Connection looks dead, recreating pool 1");
                 this.recreatePool();
             }
+            if (trx)
+                this.storeTransactionAsProblem(trx, "error:" + error.errno);
             if (request.throwable)
                 throw { ...DefaultErrors_1.default.DB_ERROR, details: error.message, stack: error };
             return {
@@ -636,10 +644,14 @@ class MysqlAdapter {
             await trx.conn.commit();
             trx.conn.removeAllListeners();
             trx.conn.release();
+            const trxIndex = this.transactions.indexOf(trx);
+            this.transactions.splice(trxIndex, 1);
         }
         catch (e) {
+            const err = this.createMysqlQueryError(e);
+            trx.queries.push({ sql: "COMMIT", status: err.code });
             await this.rollbackTransaction(trx);
-            return this.createMysqlQueryError(e);
+            return err;
         }
         return null;
     }
@@ -648,7 +660,6 @@ class MysqlAdapter {
         try {
             (0, LogService_1.logDB)("Rollback started", trx.conn.threadId);
             await trx.conn.rollback();
-            await trx.conn.commit();
             trx.conn.removeAllListeners();
             trx.conn.release();
             (0, LogService_1.logDB)("Rollback connection released", trx.conn.threadId);
@@ -656,12 +667,13 @@ class MysqlAdapter {
                 this.transactions = this.transactions.filter(i => trx && i && i.id !== trx.id);
             if (this.options.debug)
                 (0, LogService_1.logDB)("Rollback complete", trx.conn.threadId);
+            trx.queries.push({ sql: "ROLLBACK", status: "ok" });
         }
         catch (e) {
             (0, LogService_1.logCrit)("MysqlAdapter", "Can't rollback transaction", trx.queries);
             err = this.createMysqlQueryError(e);
+            trx.queries.push({ sql: "ROLLBACK", status: "fail" });
         }
-        this.storeTransactionAsProblem(trx, "rollback");
         return err;
     }
     async finish() {

package/package.json

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