badmfck-api-server 2.9.2 → 2.9.4

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.9.2";
+    version = "2.9.3";
     options;
     monitor = null;
     monitorIndexFile;

package/dist/apiServer/DBService.d.ts

@@ -1,7 +1,7 @@
 import { Req } from "badmfck-signal";
 import { BaseService } from "./BaseService";
 import { IDBAdapter } from "./db/IDBAdapter";
-export interface IDBQueryField extends Record<string, string | number | boolean | null | undefined | {
+export interface IDBQueryField {
     name?: string | null;
     value: string | number | boolean | null | undefined;
     system?: boolean;
@@ -9,12 +9,13 @@ export interface IDBQueryField extends Record<string, string | number | boolean
     ignoreInUpdate?: boolean;
     useInReplace?: boolean;
     __parsedValue?: string | number | boolean | null | undefined;
-}> {
 }
 export interface IDBQuery {
     dbid?: string;
     query: string;
-    fields?: IDBQueryField;
+    fields?: {
+        [key: string]: IDBQueryField | null | string | number | boolean;
+    };
     throwable?: boolean;
     transactionID?: number;
     calculateCount?: boolean;

package/dist/apiServer/db/MysqlAdapter.js

@@ -20,9 +20,9 @@ class MysqlAdapter {
     queries = [];
     static nextTransactionID = 1;
     transactions = [];
-    maxTransactionWaitTime = 1000 * 60 * 1;
+    maxTransactionWaitTime = 1000 * 60 * 2;
     lastSuccessQueryTime = 0;
-    pingInterval = 1000 * 60 * 2;
+    pingInterval = 1000 * 60 * 5;
     failReportFileStream = null;
     failReportFileStreamName = null;
     failReportLastAccessTime = 0;
@@ -79,8 +79,9 @@ class MysqlAdapter {
             if (Date.now() - this.lastSuccessQueryTime > this.pingInterval) {
                 if (!this.pool)
                     return;
-                for (let i = 0; i < this.options.connectionLimit; i++)
+                for (let i = 0; i < this.options.connectionLimit; i++) {
                     this.query({ query: "SELECT 1 @NOLIMIT" });
+                }
             }
         }, 1000 * 30);
         setInterval(() => {
@@ -210,6 +211,7 @@ class MysqlAdapter {
                 if (this.options.debug)
                     (0, LogService_1.logInfo)("Execute query:", query);
                 const result = await conn.query(query);
+                this.lastSuccessQueryTime = +new Date();
                 if (!request.transactionID)
                     this.finalizeConnection(conn);
                 return {
@@ -270,13 +272,16 @@ class MysqlAdapter {
         if (fields) {
             for (let i in fields) {
                 const name = i;
-                const value = fields[i];
-                if (typeof value === "string" || typeof value === "number" || typeof value === "boolean")
-                    fields[i] = { value: value, system: false };
-                if (value === undefined)
+                let queryField = fields[i];
+                if (queryField === undefined)
                     continue;
-                if (value === null)
-                    fields[i] = { value: null, system: true };
+                if (typeof queryField === "string" || typeof queryField === "number" || typeof queryField === "boolean")
+                    queryField = { value: queryField, system: false };
+                if (queryField === null)
+                    queryField = { value: null, system: true };
+                if (!queryField.name)
+                    queryField.name = name.replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', "");
+                fields[i] = queryField;
                 const parsed = MysqlAdapter.prepareQueryFieldValue(fields[i]);
                 query = query.replaceAll("@" + name, parsed + "");
             }
@@ -292,11 +297,8 @@ class MysqlAdapter {
                 let f = fields[i];
                 if (f.ignoreInInsert)
                     continue;
-                let name = f.name;
-                if (!name)
-                    name = i.replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', "");
-                insertFieldNames.push('`' + (name + "").replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', "") + '`');
-                insertFieldValues.push(f._parsedValue);
+                insertFieldNames.push('`' + f.name + '`');
+                insertFieldValues.push(f.__parsedValue);
             }
             query = query
                 .replaceAll('@fields', insertFieldNames.join(","))
@@ -309,11 +311,8 @@ class MysqlAdapter {
                 let f = fields[i];
                 if (f.ignoreInInsert)
                     continue;
-                let name = f.name;
-                if (!name)
-                    name = i.replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', "");
-                oninsertNames.push(name);
-                oninsertValues.push(f._parsedValue);
+                oninsertNames.push(f.name);
+                oninsertValues.push(f.__parsedValue);
             }
             query = query.replaceAll("@insert", `(${oninsertNames.join(",")}) VALUES (${oninsertValues.join(",")})`);
         }
@@ -323,10 +322,7 @@ class MysqlAdapter {
                 let f = fields[i];
                 if (f.ignoreInUpdate)
                     continue;
-                let name = f.name;
-                if (!name)
-                    name = i.replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', "");
-                onUpdate.push('`' + (name + "") + '` = ' + f._parsedValue);
+                onUpdate.push('`' + f.name + '` = ' + f.__parsedValue);
             }
             query = query.replaceAll("@onupdate", onUpdate.join(" , "));
         }
@@ -336,10 +332,7 @@ class MysqlAdapter {
                 let f = fields[i];
                 if (!f.useInReplace)
                     continue;
-                let name = f.name;
-                if (!name)
-                    name = i.replaceAll("`", '').replaceAll('\"', "").replaceAll('\'', "");
-                onDuplicate.push('`' + (name + "") + f._parsedValue);
+                onDuplicate.push('`' + f.name + f.__parsedValue);
             }
             query = query.replaceAll("@onduplicate", onDuplicate.join(" , "));
         }

package/package.json

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