badmfck-api-server 1.2.1 → 1.2.3

package/dist/apiServer/APIService.js

@@ -42,7 +42,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "1.2.2";
+    version = "1.2.3";
     options;
     netLog = [];
     constructor(options) {

package/dist/apiServer/MysqlService.d.ts

@@ -37,10 +37,12 @@ export declare class MysqlService extends BaseService {
     pool: Pool | null;
     options: MysqlServiceOptions;
     serviceStarted: boolean;
+    timeoutID: any;
     queries: never[];
     constructor(options: MysqlServiceOptions);
     static executeQuery(query: MySqlQuery | MySqlQuery[]): Promise<MysqlResult[]>;
     init(): Promise<void>;
+    recreatePool(): Promise<void>;
     onApplicationReady(): Promise<void>;
     static prepareQuery(query: string, fields: MysqlQueryField[]): string;
     static prepareQueryFieldValue(value: string | number | boolean | null | undefined, system?: boolean): string | number | boolean | null | undefined;

package/dist/apiServer/MysqlService.js

@@ -16,6 +16,7 @@ class MysqlService extends BaseService_1.BaseService {
     pool = null;
     options;
     serviceStarted = false;
+    timeoutID;
     queries = [];
     constructor(options) {
         super("mysql");
@@ -24,17 +25,7 @@ class MysqlService extends BaseService_1.BaseService {
     static async executeQuery(query) { return await exports.REQ_MYSQL_QUERY.request(query); }
     async init() {
         this.serviceStarted = false;
-        const ok = await this.createPool();
-        if (!ok) {
-            if (this.options.onLog)
-                this.options.onLog(2, "Mysql server not connected, retrying in 3 sec");
-            setTimeout(() => { this.init(); }, 3000);
-        }
-        else {
-            this.serviceStarted = true;
-            if (this.options.onLog)
-                this.options.onLog(1, "Mysql Service started!");
-        }
+        await this.recreatePool();
         exports.REQ_MYSQL_QUERY.listener = async (data) => {
             if (!Array.isArray(data))
                 data = [data];
@@ -46,6 +37,24 @@ class MysqlService extends BaseService_1.BaseService {
             return await Promise.all(promises);
         };
     }
+    async recreatePool() {
+        if (this.options.onLog)
+            this.options.onLog(2, "Mysql server trying to create pool");
+        this.serviceStarted = false;
+        const ok = await this.createPool();
+        if (!ok) {
+            if (this.options.onLog)
+                this.options.onLog(2, "Mysql server not connected, retrying in 3 sec");
+            if (this.timeoutID)
+                clearTimeout(this.timeoutID);
+            this.timeoutID = setTimeout(() => { this.recreatePool(); }, 3000);
+        }
+        else {
+            this.serviceStarted = true;
+            if (this.options.onLog)
+                this.options.onLog(1, "Mysql Service started!");
+        }
+    }
     async onApplicationReady() { }
     static prepareQuery(query, fields) {
         for (let i of fields) {
@@ -130,14 +139,13 @@ class MysqlService extends BaseService_1.BaseService {
                 });
                 return;
             }
-            this.pool.on("error", (evt) => {
-                if (this.options.onLog)
-                    this.options.onLog(2, `${evt}`);
-            });
             this.pool.getConnection((err, conn) => {
                 if (err) {
                     if (this.options.onLog)
                         this.options.onLog(2, `${err}`);
+                    if (`${err}`.indexOf('ECONNREFUSED') !== -1) {
+                        this.recreatePool();
+                    }
                     resolve({
                         error: err,
                         data: null,
@@ -241,6 +249,19 @@ class MysqlService extends BaseService_1.BaseService {
         if (this.options.onLog)
             this.options.onLog(1, "Connecting to mysql: \n HOST: " + this.options.host + '\n USER:' + this.options.user + '\n PORT:' + this.options.port);
         let err = false;
+        if (this.pool) {
+            try {
+                this.pool.removeAllListeners();
+                this.pool.end(err => {
+                    if (err && this.options.onLog)
+                        this.options.onLog(2, err);
+                });
+            }
+            catch (e) {
+                if (this.options.onLog)
+                    this.options.onLog(2, e);
+            }
+        }
         try {
             this.pool = mysql_1.default.createPool({
                 connectionLimit: this.options.connectionLimit,
@@ -257,7 +278,12 @@ class MysqlService extends BaseService_1.BaseService {
                 this.options.onLog(2, "Can't connect to MYSQL!");
             err = true;
         }
-        2;
+        if (!err && this.pool) {
+            this.pool.on("error", (evt) => {
+                if (this.options.onLog)
+                    this.options.onLog(2, `${evt}`);
+            });
+        }
         return new Promise((res, rej) => {
             if (err) {
                 res(false);

package/package.json

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