badmfck-api-server 2.3.5 → 2.3.7

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

package/dist/apiServer/MysqlService.d.ts

@@ -95,7 +95,8 @@ export declare class MysqlService extends BaseService {
     constructor(options: MysqlServiceOptions);
     static executeQuery(query: MySqlQuery | MySqlQuery[]): Promise<MysqlResult[]>;
     init(): Promise<void>;
-    rollbackTransaction(trx: ITransaction, donNotRemove?: boolean): Promise<void>;
+    commit(trx: ITransaction): Promise<MysqlError | null>;
+    rollbackTransaction(trx: ITransaction, donNotRemove?: boolean): Promise<MysqlError | null>;
     finishApp(): Promise<void>;
     storeTransactionAsProblem(trx: ITransaction, message: string): Promise<void>;
     recreatePool(): Promise<boolean>;

package/dist/apiServer/MysqlService.js

@@ -155,7 +155,7 @@ class MysqlService extends BaseService_1.BaseService {
             if (this.debug)
                 console.log("Begin transaction with id ", tid);
             try {
-                await conn.beginTransaction();
+                await conn.query("START TRANSACTION");
                 const res = await conn.query("SET autocommit=0");
                 if (this.debug)
                     console.log("Transaction started, SET autocommit=0 ", tid, res);
@@ -218,12 +218,7 @@ 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);
-            this.rollbackTransaction(trx);
+            await this.rollbackTransaction(trx);
             return null;
         };
         exports.REQ_MYSQL_TCOMMIT.listener = async (tid) => {
@@ -243,18 +238,8 @@ class MysqlService extends BaseService_1.BaseService {
             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.rollbackTransaction(trx);
-                return this.createMysqlQueryError(e);
-            }
-            return null;
+            const err = await this.commit(trx);
+            return err;
         };
         exports.REQ_MYSQL_TRANSACTION.listener = async (data) => {
             if (!this.pool)
@@ -271,8 +256,7 @@ class MysqlService extends BaseService_1.BaseService {
             };
             let income = [];
             try {
-                await conn.beginTransaction();
-                await conn.query("SET autocommit=0");
+                await conn.query("START TRANSACTION; SET autocommit=0");
             }
             catch (e) {
                 const err = this.createMysqlQueryError(e);
@@ -298,21 +282,27 @@ class MysqlService extends BaseService_1.BaseService {
                     return { error: err, data: null };
                 }
             }
-            try {
-                await conn.commit();
-            }
-            catch (e) {
-                await this.rollbackTransaction(trx);
-                const err = this.createMysqlQueryError(e);
-                return { error: err, data: null };
-            }
-            return { error: null, data: income };
+            const err = await this.commit(trx);
+            return { error: err, data: income };
         };
     }
+    async commit(trx) {
+        try {
+            await trx.conn.query("COMMIT");
+            trx.conn.removeAllListeners();
+            trx.conn.release();
+        }
+        catch (e) {
+            await this.rollbackTransaction(trx);
+            return this.createMysqlQueryError(e);
+        }
+        return null;
+    }
     async rollbackTransaction(trx, donNotRemove) {
+        let err = null;
         try {
             console.log("Rollback started", trx.conn);
-            await trx.conn.rollback();
+            await trx.conn.query("ROLLBACK");
             trx.conn.removeAllListeners();
             trx.conn.release();
             if (!donNotRemove)
@@ -322,8 +312,10 @@ class MysqlService extends BaseService_1.BaseService {
         }
         catch (e) {
             (0, LogService_1.logCrit)("${MysqlService.js}", "Can't rollback transaction", trx);
+            err = this.createMysqlQueryError(e);
         }
         this.storeTransactionAsProblem(trx, "rollback");
+        return err;
     }
     async finishApp() {
         console.log("Finishing mysql service");
@@ -364,7 +356,7 @@ class MysqlService extends BaseService_1.BaseService {
                 console.log("Store transaction fail report: ", file, trx, message);
             if (!this.failReportFileStream)
                 this.failReportFileStream = fs_1.default.createWriteStream(file, { flags: 'a' });
-            this.failReportFileStream.write(JSON.stringify({ queries: trx.queries, time: trx.timestamp, date, message }) + "\n{'s':'&$5__1AzZa'}\n", err => {
+            this.failReportFileStream.write(JSON.stringify({ queries: trx.queries, time: trx.timestamp, date, message }) + "\n}EOB{\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.5",
+  "version": "2.3.7",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",