badmfck-api-server 2.8.9 → 2.9.1

package/dist/apiServer/APIService.js

@@ -89,7 +89,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "2.8.9";
+    version = "2.9.0";
     options;
     monitor = null;
     monitorIndexFile;

package/dist/apiServer/BaseService.js

@@ -1,17 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseService = void 0;
-const badmfck_signal_1 = __importDefault(require("badmfck-signal"));
-const finalize = new badmfck_signal_1.default();
+const finalize = [];
 process.on('SIGINT', async () => {
-    finalize.invoke();
+    await Promise.all(finalize.map(f => f()));
     process.exit(0);
 });
 process.on('SIGTERM', async () => {
-    finalize.invoke();
+    await Promise.all(finalize.map(f => f()));
     process.exit(0);
 });
 class BaseService {
@@ -21,10 +17,10 @@ class BaseService {
     }
     async init() {
         console.log("Service: " + this.name + " initialized");
-        finalize.subscribe(this.finishService);
+        finalize.push(this.finishService);
     }
     async finishService() {
-        console.log("Service: " + this.name + " finished -- not implemented --");
+        console.log("finishService -> " + this.name);
     }
     getName() {
         return this.name;

package/dist/apiServer/db/MysqlAdapter.js

@@ -236,7 +236,7 @@ class MysqlAdapter {
             }
         }
         catch (e) {
-            (0, LogService_1.logCrit)("MysqlAdapter", `Error when executing query: ${e}`);
+            (0, LogService_1.logCrit)("MysqlAdapter", `Error when executing query: ${query}`, e);
             const error = {
                 code: "EXEC_ERROR",
                 errno: 100002,
@@ -292,9 +292,10 @@ class MysqlAdapter {
                 let f = fields[i];
                 if (f.ignoreInInsert)
                     continue;
-                if (!f.name)
-                    continue;
-                insertFieldNames.push('`' + (f.name + "").replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', "") + '`');
+                let name = f.name;
+                if (!name)
+                    name = i.replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', "");
+                insertFieldNames.push('`' + (name + "").replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', "") + '`');
                 insertFieldValues.push(f._parsedValue);
             }
             query = query
@@ -308,7 +309,10 @@ class MysqlAdapter {
                 let f = fields[i];
                 if (f.ignoreInInsert)
                     continue;
-                oninsertNames.push((f.name + "").replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', ""));
+                let name = f.name;
+                if (!name)
+                    name = i.replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', "");
+                oninsertNames.push(name);
                 oninsertValues.push(f._parsedValue);
             }
             query = query.replaceAll("@insert", `(${oninsertNames.join(",")}) VALUES (${oninsertValues.join(",")})`);
@@ -319,7 +323,10 @@ class MysqlAdapter {
                 let f = fields[i];
                 if (f.ignoreInUpdate)
                     continue;
-                onUpdate.push('`' + (f.name + "").replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', "") + '` = ' + f._parsedValue);
+                let name = f.name;
+                if (!name)
+                    name = i.replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', "");
+                onUpdate.push('`' + (name + "") + '` = ' + f._parsedValue);
             }
             query = query.replaceAll("@onupdate", onUpdate.join(" , "));
         }
@@ -329,7 +336,10 @@ class MysqlAdapter {
                 let f = fields[i];
                 if (!f.useInReplace)
                     continue;
-                onDuplicate.push('`' + (f.name + "").replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', "") + '` = ' + f._parsedValue);
+                let name = f.name;
+                if (!name)
+                    name = i.replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', "");
+                onDuplicate.push('`' + (name + "") + f._parsedValue);
             }
             query = query.replaceAll("@onduplicate", onDuplicate.join(" , "));
         }
@@ -341,7 +351,9 @@ class MysqlAdapter {
         if (value === null || value === undefined)
             return "NULL";
         if (!system && typeof value === "string")
-            value = value.replaceAll('"', '\\"');
+            value = '"' + value.replaceAll('"', '\\"') + '"';
+        if (typeof value === "boolean")
+            value = value ? 1 : 0;
         field.__parsedValue = value;
         return value;
     }

package/package.json

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