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

package/dist/apiServer/MysqlService.d.ts

@@ -25,6 +25,7 @@ export interface MysqlServiceOptions {
     transactionFailReport?: (trx: ITransaction, message: string) => void;
     transactionFailReportDir?: string;
     debug?: boolean;
+    naxTransactionWaitTime?: number;
     migrations?: {
         dir: string;
         callback: () => void;

package/dist/apiServer/MysqlService.js

@@ -52,9 +52,9 @@ class MysqlService extends BaseService_1.BaseService {
     timeoutID;
     debug = false;
     queries = [];
-    static nextTransactionID = 0;
+    static nextTransactionID = 1;
     transactions = [];
-    maxTransactionWaitTime = 1000 * 60 * 2;
+    maxTransactionWaitTime = 1000 * 60 * 1;
     failReportFileStream = null;
     failReportFileStreamName = null;
     failReportLastAccessTime = 0;
@@ -71,22 +71,25 @@ class MysqlService extends BaseService_1.BaseService {
             this.options.password = decrypt(this.options.password.substring(1)) ?? this.options.password;
         if (this.options.debug)
             this.debug = true;
+        if (this.options.naxTransactionWaitTime)
+            this.maxTransactionWaitTime = this.options.naxTransactionWaitTime;
         setInterval(() => {
             const now = Date.now();
-            this.transactions = this.transactions.filter(async (i) => {
-                if (now - i.timestamp < this.maxTransactionWaitTime)
-                    return true;
-                try {
+            const count = this.transactions.length;
+            const removedIDs = [];
+            for (let i of this.transactions) {
+                if (now - i.timestamp > this.maxTransactionWaitTime) {
                     (0, LogService_1.logError)("Release transaction connection due to timeout");
                     i.conn.removeAllListeners();
-                    await i.conn.rollback();
+                    i.conn.rollback();
                     i.conn.release();
+                    this.storeTransactionAsProblem(i, "Timeout");
+                    removedIDs.push(i.id);
                 }
-                catch (e) {
-                    (0, LogService_1.logError)("Can't release transaction", e);
-                }
-                return false;
-            });
+            }
+            this.transactions = this.transactions.filter(i => !removedIDs.includes(i.id));
+            if (this.debug)
+                console.log("Removed: ", count - this.transactions.length);
         }, 1000 * 30);
         setInterval(() => {
             if (!this.failReportFileStream)
@@ -145,6 +148,12 @@ class MysqlService extends BaseService_1.BaseService {
             const conn = await this.pool?.getConnection();
             if (!conn)
                 return { code: "NO_POOL", errno: 100000, fatal: true, sql: "", name: "NO_POOL", message: "Mysql pool not created" };
+            for (let i of this.transactions) {
+                if (i.conn === conn) {
+                    (0, LogService_1.logInfo)("Your connection is in transaction");
+                    return { code: "CONN_IN_TRX", errno: 100005, fatal: true, sql: "", name: "CONN_IN_TRX", message: "Connection is in transaction" };
+                }
+            }
             const tid = MysqlService.nextTransactionID++;
             if (this.debug)
                 console.log("Begin transaction with id ", tid);
@@ -397,7 +406,9 @@ class MysqlService extends BaseService_1.BaseService {
             }
             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 (!this.failReportFileStream)
+                this.failReportFileStream = fs_1.default.createWriteStream(file, { flags: 'a' });
+            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

package/package.json

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