badmfck-api-server 3.6.7 → 3.6.8

package/dist/apiServer/APIService.js

@@ -95,7 +95,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "3.6.7";
+    version = "3.6.8";
     options;
     monitor = null;
     started = new Date();

package/dist/apiServer/DBService.d.ts

@@ -68,7 +68,8 @@ export interface DBAdapterOptions {
     queueLimit?: number;
     transactionFailReport?: (trx: any, message: string) => void;
     transactionFailReportDir?: string;
-    naxTransactionWaitTime?: number;
+    maxTransactionWaitTime?: number;
+    maxQueryTimeout?: number;
     debug?: boolean;
 }
 type ILongQuery = {

package/dist/apiServer/DBService.js

@@ -70,7 +70,7 @@ class DBService extends BaseService_1.BaseService {
                     longQueries: this.longQueries
                 }
             });
-        }, 1000 * 60 * 60);
+        }, 1000 * 60 * 1);
     }
     async init() {
         super.init();

package/dist/apiServer/db/MysqlAdapter.d.ts

@@ -44,6 +44,7 @@ export declare class MysqlAdapter implements IDBAdapter {
     tRollback(trxid: number): Promise<IDBResult>;
     bulk(request: IDBBulkQuery): Promise<IDBResult[]>;
     getConnection(transactionId?: number): Promise<mysql.PoolConnection | IDBError>;
+    withTimeout<T>(promise: Promise<T>, ms: number, query: string): Promise<T>;
     query(request: IDBQuery, conn?: mysql.PoolConnection): Promise<IDBResult>;
     finalizeConnection(conn: mysql.PoolConnection): void;
     prepareQuery(request: IDBQuery): string;

package/dist/apiServer/db/MysqlAdapter.js

@@ -326,15 +326,15 @@ class MysqlAdapter {
                 throwable: i.throwable,
             }));
         }
-        if (conn) {
-            this.finalizeConnection(conn);
-            conn = null;
-        }
         if (queries && queries.length > 0) {
             const responses = await Promise.all(queries);
             for (let i of responses)
                 results.push(i);
         }
+        if (conn) {
+            this.finalizeConnection(conn);
+            conn = null;
+        }
         return results;
     }
     async getConnection(transactionId) {
@@ -368,8 +368,10 @@ class MysqlAdapter {
                 return conn;
         }
         catch (e) {
-            if (`${e}`.indexOf('ECONNREFUSED') !== -1)
+            if (`${e}`.indexOf('ECONNREFUSED') !== -1 || `${e}`.indexOf("PROTOCOL_") !== -1 || `${e}`.includes("closed state")) {
+                (0, LogService_1.logError)("Connection looks dead, recreating pool 2");
                 this.recreatePool();
+            }
         }
         (0, LogService_1.logCrit)("${MysqlAdapter.js}", `No connection created!`);
         return {
@@ -382,6 +384,27 @@ class MysqlAdapter {
             isDuplicateError: false
         };
     }
+    withTimeout(promise, ms, query) {
+        return new Promise((resolve, reject) => {
+            const timeout = setTimeout(() => {
+                reject({
+                    code: "TIME_OUT",
+                    errno: 100013,
+                    sql: query,
+                    name: "TIME_OUT",
+                    fatal: true,
+                    message: "Query timeout reached " + ms
+                });
+            }, ms);
+            promise.then((res) => {
+                clearTimeout(timeout);
+                resolve(res);
+            }).catch((err) => {
+                clearTimeout(timeout);
+                reject(err);
+            });
+        });
+    }
     async query(request, conn) {
         let executionStartTime = Date.now();
         const query = this.prepareQuery(request);
@@ -390,6 +413,8 @@ class MysqlAdapter {
                 (0, LogService_1.logDB)(query);
         }
         if (request.parseQueryOnly) {
+            if (conn && !request.transactionID)
+                this.finalizeConnection(conn);
             return {
                 data: [{ query }],
                 error: null,
@@ -415,7 +440,11 @@ class MysqlAdapter {
             }
         }
         try {
-            const result = await conn.query(query);
+            let result = null;
+            if (this.options.maxQueryTimeout && this.options.maxQueryTimeout > 0)
+                result = await this.withTimeout(conn.query(query), this.options.maxQueryTimeout ?? 1000 * 25, query);
+            else
+                result = await conn.query(query);
             this.lastSuccessQueryTime = +new Date();
             if (!request.transactionID && doCloseConnection)
                 this.finalizeConnection(conn);
@@ -440,8 +469,10 @@ class MysqlAdapter {
                 this.finalizeConnection(conn);
             }
             const error = this.createMysqlQueryError(e);
-            if (`${e}`.indexOf('ECONNREFUSED') !== -1)
+            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 (request.throwable)
                 throw { ...DefaultErrors_1.default.DB_ERROR, details: error.message, stack: error };
             return {
@@ -456,8 +487,8 @@ class MysqlAdapter {
     }
     finalizeConnection(conn) {
         try {
-            conn.release();
             conn.removeAllListeners();
+            conn.release();
             if (this.options.debug)
                 (0, LogService_1.logDB)("Release connection: ", conn.threadId);
         }
@@ -636,7 +667,7 @@ class MysqlAdapter {
                 sql: err.sql,
                 name: err.name,
                 message: err.message,
-                fatal: false,
+                fatal: err.fatal && typeof err.fatal === "boolean" ? err.fatal : false,
                 isDuplicateError: err.code.toLowerCase().indexOf("dup_entry") !== -1
             };
         }

package/package.json

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