badmfck-api-server 1.1.7 → 1.1.9

package/dist/apiServer/APIService.js

@@ -16,7 +16,6 @@ function getDefaultOptions() {
         baseEndPoint: '/api/',
         corsHostWhiteList: [
             'http://localhost:3000',
-            'http://localhost:8091',
         ],
         endpoints: [],
         jsonLimit: "10mb",
@@ -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.d.ts

@@ -36,7 +36,8 @@ export declare class MysqlService extends BaseService {
     reconnecting: boolean;
     pool: Pool | null;
     options: MysqlServiceOptions;
-    retries: number;
+    serviceStarted: boolean;
+    queries: never[];
     constructor(options: MysqlServiceOptions);
     static executeQuery(query: MySqlQuery | MySqlQuery[]): Promise<MysqlResult[]>;
     init(): Promise<void>;

package/dist/apiServer/MysqlService.js

@@ -15,7 +15,8 @@ class MysqlService extends BaseService_1.BaseService {
     reconnecting = false;
     pool = null;
     options;
-    retries = 5;
+    serviceStarted = false;
+    queries = [];
     constructor(options) {
         super("mysql");
         this.options = options;
@@ -23,10 +24,17 @@ 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");
+                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!");
         }
         exports.REQ_MYSQL_QUERY.listener = async (data) => {
             if (!Array.isArray(data))
@@ -72,7 +80,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 = [];
@@ -95,6 +103,8 @@ class MysqlService extends BaseService_1.BaseService {
         return query;
     }
     static prepareQueryFieldValue(value, system) {
+        if (value === null)
+            return "NULL";
         if (!system && typeof value === "string") {
             value = value ? value.replaceAll('"', '\\"') : null;
             value = '"' + value + '"';
@@ -120,6 +130,10 @@ 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)
@@ -132,6 +146,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 +170,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 +257,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.7",
+  "version": "1.1.9",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",