badmfck-api-server 2.2.1 → 2.2.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.2.1";
+    version = "2.2.3";
     options;
     monitor;
     monitorIndexFile;

package/dist/apiServer/MysqlService.d.ts

@@ -1,6 +1,8 @@
+/// <reference types="node" />
 import { BaseService } from "./BaseService";
 import Signal, { Req } from "badmfck-signal";
 import * as mysql from "mysql2/promise";
+import fs from "fs";
 export declare const S_MYSQL_STARTED: Signal<void>;
 export declare const REQ_MYSQL_QUERY: Req<MySqlQuery | MySqlQuery[], MysqlResult[]>;
 export declare const REQ_MYSQL_TRANSACTION: Req<MySqlQuery[], MysqlResult>;
@@ -9,7 +11,8 @@ export declare const REQ_MYSQL_TQUERY: Req<{
     query: MySqlQuery;
     tid: number;
 }, MysqlResult>;
-export declare const REQ_MYSQL_TEND: Req<number, MysqlError | null>;
+export declare const REQ_MYSQL_TCOMMIT: Req<number, MysqlError | null>;
+export declare const REQ_MYSQL_TROLLBACK: Req<number, MysqlError | null>;
 export declare const executeQuery: (query: MySqlQuery | MySqlQuery[]) => Promise<MysqlResult[]>;
 export interface MysqlServiceOptions {
     connectionLimit: number;
@@ -44,6 +47,7 @@ export interface MySqlQuery {
     query: string;
     fields: MysqlQueryField[] | MysqlQueryFieldObject;
     rollbackQuery?: string | null;
+    transactionID: number;
 }
 export interface MysqlQueryField {
     name: string;
@@ -82,6 +86,9 @@ export declare class MysqlService extends BaseService {
     static nextTransactionID: number;
     transactions: ITransaction[];
     maxTransactionWaitTime: number;
+    failReportFileStream: fs.WriteStream | null;
+    failReportFileStreamName: string | null;
+    failReportLastAccessTime: number;
     constructor(options: MysqlServiceOptions);
     static executeQuery(query: MySqlQuery | MySqlQuery[]): Promise<MysqlResult[]>;
     init(): Promise<void>;
@@ -93,7 +100,7 @@ export declare class MysqlService extends BaseService {
     static objectToFields(obj: MysqlQueryFieldObject | MysqlQueryField[]): MysqlQueryField[];
     static prepareQuery(query: string, fields: MysqlQueryField[] | MysqlQueryFieldObject): string;
     static prepareQueryFieldValue(value: string | number | boolean | null | undefined, system?: boolean): string | number | boolean | null | undefined;
-    execute(query: string, rollbackQuery: string | null): Promise<MysqlResult>;
+    execute(query: string, rollbackQuery: string | null, transactionID: number): Promise<MysqlResult>;
     sendQuery(conn: mysql.PoolConnection, query: string, resolve: (data: MysqlResult) => void, rollback: string | null): Promise<void>;
     queryAsync(conn: mysql.PoolConnection, query: string): Promise<{
         err: MysqlError | null;

package/dist/apiServer/MysqlService.js

@@ -22,19 +22,25 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlService = exports.executeQuery = exports.REQ_MYSQL_TEND = exports.REQ_MYSQL_TQUERY = exports.REQ_MYSQL_TBEGIN = exports.REQ_MYSQL_TRANSACTION = exports.REQ_MYSQL_QUERY = exports.S_MYSQL_STARTED = void 0;
+exports.MysqlService = exports.executeQuery = exports.REQ_MYSQL_TROLLBACK = exports.REQ_MYSQL_TCOMMIT = exports.REQ_MYSQL_TQUERY = exports.REQ_MYSQL_TBEGIN = exports.REQ_MYSQL_TRANSACTION = exports.REQ_MYSQL_QUERY = exports.S_MYSQL_STARTED = void 0;
 const BaseService_1 = require("./BaseService");
 const badmfck_signal_1 = __importStar(require("badmfck-signal"));
 const crypto_1 = require("crypto");
 const LogService_1 = require("./LogService");
 const mysql = __importStar(require("mysql2/promise"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 exports.S_MYSQL_STARTED = new badmfck_signal_1.default();
 exports.REQ_MYSQL_QUERY = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_QUERY");
 exports.REQ_MYSQL_TRANSACTION = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TRANSACTION");
 exports.REQ_MYSQL_TBEGIN = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TRANSACTION_BEGING");
 exports.REQ_MYSQL_TQUERY = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TRANSACTION_ADD_OPERATION");
-exports.REQ_MYSQL_TEND = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TRANSACTION_END");
+exports.REQ_MYSQL_TCOMMIT = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TCOMMIT");
+exports.REQ_MYSQL_TROLLBACK = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TROLLBACK");
 const executeQuery = async (query) => { return await exports.REQ_MYSQL_QUERY.request(query); };
 exports.executeQuery = executeQuery;
 class MysqlService extends BaseService_1.BaseService {
@@ -48,6 +54,9 @@ class MysqlService extends BaseService_1.BaseService {
     static nextTransactionID = 0;
     transactions = [];
     maxTransactionWaitTime = 1000 * 60 * 2;
+    failReportFileStream = null;
+    failReportFileStreamName = null;
+    failReportLastAccessTime = 0;
     constructor(options) {
         super("mysql");
         this.options = options;
@@ -76,11 +85,18 @@ class MysqlService extends BaseService_1.BaseService {
                 return false;
             });
         }, 1000 * 30);
+        setInterval(() => {
+            if (!this.failReportFileStream)
+                return;
+            if (Date.now() - this.failReportLastAccessTime > 1000 * 60 * 15) {
+                this.failReportFileStream.end();
+                this.failReportFileStream = null;
+            }
+        }, 1000 * 60 * 5);
         if (options.transactionFailReportDir) {
-            const fs = require('fs');
             try {
-                if (!fs.existsSync(options.transactionFailReportDir)) {
-                    fs.mkdirSync(options.transactionFailReportDir);
+                if (!fs_1.default.existsSync(options.transactionFailReportDir)) {
+                    fs_1.default.mkdirSync(options.transactionFailReportDir);
                 }
             }
             catch (e) {
@@ -118,7 +134,7 @@ class MysqlService extends BaseService_1.BaseService {
             const promises = [];
             for (let i of data) {
                 const query = MysqlService.prepareQuery(i.query, i.fields);
-                promises.push(this.execute(query, i.rollbackQuery ?? null));
+                promises.push(this.execute(query, i.rollbackQuery ?? null, i.transactionID));
             }
             return await Promise.all(promises);
         };
@@ -186,7 +202,30 @@ class MysqlService extends BaseService_1.BaseService {
                 rollbackError: rollbackError
             };
         };
-        exports.REQ_MYSQL_TEND.listener = async (tid) => {
+        exports.REQ_MYSQL_TROLLBACK.listener = async (tid) => {
+            const trx = this.transactions.find(i => i.id === tid);
+            if (!trx)
+                return {
+                    code: "NO_TRX",
+                    errno: 100004,
+                    fatal: true,
+                    sql: "",
+                    name: "NO_TRX",
+                    message: "Transaction not found"
+                };
+            this.transactions = this.transactions.filter(i => i.id !== tid);
+            try {
+                await trx.conn.rollback();
+                trx.conn.removeAllListeners();
+                trx.conn.release();
+            }
+            catch (e) {
+                (0, LogService_1.logError)("Can't rollback transaction");
+                return this.createMysqlQueryError(e);
+            }
+            return null;
+        };
+        exports.REQ_MYSQL_TCOMMIT.listener = async (tid) => {
             const trx = this.transactions.find(i => i.id === tid);
             if (!trx)
                 return {
@@ -205,6 +244,14 @@ class MysqlService extends BaseService_1.BaseService {
             }
             catch (e) {
                 this.storeTransactionAsProblem(trx, "Can't commit transaction");
+                try {
+                    trx.conn.removeAllListeners();
+                    await trx.conn.rollback();
+                    trx.conn.release();
+                }
+                catch (e) {
+                    (0, LogService_1.logError)("Can't rollback transaction");
+                }
                 return this.createMysqlQueryError(e);
             }
             return null;
@@ -225,40 +272,46 @@ class MysqlService extends BaseService_1.BaseService {
             try {
                 await conn.beginTransaction();
                 await conn.query("SET autocommit=0");
-                for (let i of data) {
-                    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 };
-                }
+            }
+            catch (e) {
+                const err = this.createMysqlQueryError(e);
+                this.storeTransactionAsProblem(trx, err.message);
+                return { error: err, data: null };
+            }
+            for (let i of data) {
+                const query = MysqlService.prepareQuery(i.query, i.fields);
+                let err = null;
                 try {
-                    await conn.commit();
+                    const d = await conn.query(query);
+                    income.push(d[0]);
                 }
                 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 };
+                    err = this.createMysqlQueryError(e);
+                }
+                trx.queries.push({
+                    sql: query,
+                    status: err ? err.message : "completed"
+                });
+                if (err) {
+                    this.storeTransactionAsProblem(trx, err.message);
+                    return { error: err, data: null };
                 }
             }
+            try {
+                await conn.commit();
+            }
             catch (e) {
-                return { error: this.createMysqlQueryError(e), data: null };
+                let rollbackError = null;
+                try {
+                    await conn.rollback();
+                }
+                catch (e2) {
+                    (0, LogService_1.logCrit)("${MysqlService.js}", "Can't rollback transaction!");
+                    rollbackError = this.createMysqlQueryError(e2);
+                }
+                const err = this.createMysqlQueryError(e);
+                this.storeTransactionAsProblem(trx, err.message);
+                return { error: err, data: null, rollbackError: rollbackError };
             }
             return { error: null, data: income };
         };
@@ -283,13 +336,37 @@ class MysqlService extends BaseService_1.BaseService {
                 (0, LogService_1.logCrit)("${MysqlService.js}", "Can't close MYSQL pool!");
             }
         }
+        if (this.failReportFileStream)
+            this.failReportFileStream.end();
+        this.failReportFileStream = null;
     }
     async storeTransactionAsProblem(trx, message) {
-        if (!this.options.transactionFailReport) {
-            (0, LogService_1.logCrit)("${MysqlService.js}", "Can't report failed transaction, no report function: transactionFailReport in options");
+        if (!this.options.transactionFailReport && !this.options.transactionFailReportDir) {
+            (0, LogService_1.logCrit)("${MysqlService.js}", "Can't report failed transaction, no report function: transactionFailReport in options, and transactionFailReportDir isnt set");
             return;
         }
-        this.options.transactionFailReport(trx, message);
+        if (this.options.transactionFailReportDir) {
+            const yyymmdd = new Date().toISOString().substring(0, 10).replaceAll("-", "");
+            const date = new Date();
+            const file = path_1.default.resolve(this.options.transactionFailReportDir, yyymmdd + ".json");
+            if (this.failReportFileStream) {
+                if (this.failReportFileStreamName !== file) {
+                    this.failReportFileStream.end();
+                    this.failReportFileStream = null;
+                }
+            }
+            if (this.failReportFileStreamName) {
+                this.failReportFileStream = fs_1.default.createWriteStream(file, { flags: 'a' });
+                this.failReportFileStreamName = file;
+            }
+            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");
+            });
+            this.failReportLastAccessTime = Date.now();
+        }
+        if (this.options.transactionFailReport)
+            this.options.transactionFailReport(trx, message);
     }
     async recreatePool() {
         (0, LogService_1.logInfo)("${MysqlService.js}", "Connecting to mysql: \n HOST: " + this.options.host + '\n PORT:' + this.options.port);
@@ -466,7 +543,7 @@ class MysqlService extends BaseService_1.BaseService {
             return "NULL";
         return value;
     }
-    async execute(query, rollbackQuery) {
+    async execute(query, rollbackQuery, transactionID) {
         return new Promise(async (resolve, reject) => {
             if (!this.pool) {
                 (0, LogService_1.logError)("${MysqlService.js}", "No pool");
@@ -484,7 +561,13 @@ class MysqlService extends BaseService_1.BaseService {
                 return;
             }
             try {
-                const conn = await this.pool.getConnection();
+                let conn = null;
+                if (transactionID && transactionID > 0) {
+                    conn = this.transactions.find(i => i.id === transactionID)?.conn ?? null;
+                }
+                else {
+                    conn = await this.pool.getConnection();
+                }
                 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.1",
+  "version": "2.2.3",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",