badmfck-api-server 1.1.6 → 1.1.8

package/dist/apiServer/APIService.js

@@ -16,7 +16,6 @@ function getDefaultOptions() {
         baseEndPoint: '/api/',
         corsHostWhiteList: [
             'http://localhost:3000',
-            'http://localhost:8091',
         ],
         endpoints: [],
         jsonLimit: "10mb",
@@ -30,8 +29,8 @@ function getDefaultOptions() {
     };
 }
 exports.getDefaultOptions = getDefaultOptions;
-exports.REQ_CREATE_NET_LOG = new badmfck_signal_1.Req();
-exports.REQ_HTTP_LOG = new badmfck_signal_1.Req();
+exports.REQ_CREATE_NET_LOG = new badmfck_signal_1.Req("REQ_CREATE_NET_LOG");
+exports.REQ_HTTP_LOG = new badmfck_signal_1.Req("REQ_HTTP_LOG");
 async function Initializer(services) {
     for (let i of services) {
         await i.init();
@@ -49,6 +48,11 @@ class APIService extends BaseService_1.BaseService {
     constructor(options) {
         super('HTTP Service');
         this.options = options ?? getDefaultOptions();
+        if (!this.options.corsHostWhiteList)
+            this.options.corsHostWhiteList = [];
+        const self = "http://localhost:" + this.options.port;
+        if (!this.options.corsHostWhiteList.find(val => val === self))
+            this.options.corsHostWhiteList.push();
     }
     async init() {
         exports.REQ_HTTP_LOG.listener = async (ignore) => this.netLog;

package/dist/apiServer/MysqlService.js

@@ -7,7 +7,7 @@ exports.MysqlService = exports.executeQuery = exports.REQ_MYSQL_QUERY = void 0;
 const mysql_1 = __importDefault(require("mysql"));
 const BaseService_1 = require("./BaseService");
 const badmfck_signal_1 = require("badmfck-signal");
-exports.REQ_MYSQL_QUERY = new badmfck_signal_1.Req();
+exports.REQ_MYSQL_QUERY = new badmfck_signal_1.Req("REQ_MYSQL_QUERY");
 const executeQuery = async (query) => { return await exports.REQ_MYSQL_QUERY.request(query); };
 exports.executeQuery = executeQuery;
 class MysqlService extends BaseService_1.BaseService {
@@ -26,7 +26,8 @@ class MysqlService extends BaseService_1.BaseService {
         const ok = await this.createPool();
         if (!ok) {
             if (this.options.onLog)
-                this.options.onLog(2, "Mysql server not connected");
+                this.options.onLog(2, "Mysql server not connected, retrying in 3 sec");
+            setTimeout(() => { this.init(); }, 3000);
         }
         exports.REQ_MYSQL_QUERY.listener = async (data) => {
             if (!Array.isArray(data))
@@ -72,7 +73,7 @@ class MysqlService extends BaseService_1.BaseService {
                 oninsertNames.push(i.name);
                 oninsertValues.push(i._parsedValue);
             }
-            query = query.replaceAll("@oninsert", `(${oninsertNames.join(",")}) VALUES (${oninsertValues.join(",")})`);
+            query = query.replaceAll("@insert", `(${oninsertNames.join(",")}) VALUES (${oninsertValues.join(",")})`);
         }
         if (query.indexOf("@onupdate") !== -1) {
             let onUpdate = [];
@@ -132,6 +133,8 @@ class MysqlService extends BaseService_1.BaseService {
                     return;
                 }
                 if (!conn) {
+                    if (this.options.onLog)
+                        this.options.onLog(2, `NO_CONN`);
                     resolve({
                         error: {
                             code: "NO_CONN",
@@ -154,6 +157,8 @@ class MysqlService extends BaseService_1.BaseService {
                         conn.release();
                     }
                     catch (e) { }
+                    if (this.options.onLog)
+                        this.options.onLog(2, "QUERY_ERR " + e);
                     resolve({
                         error: {
                             code: "QUERY_ERR",
@@ -239,6 +244,7 @@ class MysqlService extends BaseService_1.BaseService {
                 this.options.onLog(2, "Can't connect to MYSQL!");
             err = true;
         }
+        2;
         return new Promise((res, rej) => {
             if (err) {
                 res(false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "badmfck-api-server",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@types/mysql": "^2.15.21",
     "axios": "^1.4.0",
-    "badmfck-signal": "^1.2.6",
+    "badmfck-signal": "^1.2.7",
     "cors": "^2.8.5",
     "express": "^4.18.2",
     "mysql": "^2.18.1"