badmfck-api-server 2.3.9 → 2.4.1

package/dist/apiServer/APIService.js

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

package/dist/apiServer/MysqlService.d.ts

@@ -5,7 +5,6 @@ import * as mysql from "mysql2/promise";
 import fs from "fs";
 export declare const S_MYSQL_STARTED: Signal<void>;
 export declare const REQ_MYSQL_QUERY: Req<MySqlQuery | MySqlQuery[], MysqlResult[]>;
-export declare const REQ_MYSQL_TRANSACTION: Req<MySqlQuery[], MysqlResult>;
 export declare const REQ_MYSQL_TBEGIN: Req<void, number | MysqlError>;
 export declare const REQ_MYSQL_TQUERY: Req<{
     query: MySqlQuery;
@@ -70,6 +69,7 @@ export interface ITransaction {
     }[];
 }
 export interface MysqlQueryFieldObject extends Record<string, string | number | boolean | null | undefined | {
+    name?: string | null;
     value: string | number | boolean | null | undefined;
     system?: boolean;
     ignoreInInsert?: boolean;

package/dist/apiServer/MysqlService.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlService = exports.executeQuery = exports.REQ_MYSQL_TROLLBACK = exports.REQ_MYSQL_TCOMMIT = exports.REQ_MYSQL_TQUERY = exports.REQ_MYSQL_TBEGIN = exports.REQ_MYSQL_TRANSACTION = exports.REQ_MYSQL_QUERY = exports.S_MYSQL_STARTED = void 0;
+exports.MysqlService = exports.executeQuery = exports.REQ_MYSQL_TROLLBACK = exports.REQ_MYSQL_TCOMMIT = exports.REQ_MYSQL_TQUERY = exports.REQ_MYSQL_TBEGIN = exports.REQ_MYSQL_QUERY = exports.S_MYSQL_STARTED = void 0;
 const BaseService_1 = require("./BaseService");
 const badmfck_signal_1 = __importStar(require("badmfck-signal"));
 const crypto_1 = require("crypto");
@@ -36,7 +36,6 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 exports.S_MYSQL_STARTED = new badmfck_signal_1.default();
 exports.REQ_MYSQL_QUERY = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_QUERY");
-exports.REQ_MYSQL_TRANSACTION = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TRANSACTION");
 exports.REQ_MYSQL_TBEGIN = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TRANSACTION_BEGING");
 exports.REQ_MYSQL_TQUERY = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TRANSACTION_ADD_OPERATION");
 exports.REQ_MYSQL_TCOMMIT = new badmfck_signal_1.Req(undefined, "REQ_MYSQL_TCOMMIT");
@@ -201,7 +200,7 @@ class MysqlService extends BaseService_1.BaseService {
                 console.log("Query execution status:", err ? err.message : "completed");
             trx.queries.push({ sql: query, status: err ? err.message : "completed" });
             return {
-                data: sqlData,
+                data: sqlData ? sqlData[0] : null,
                 error: err,
             };
         };
@@ -240,50 +239,6 @@ class MysqlService extends BaseService_1.BaseService {
             const err = await this.commit(trx);
             return err;
         };
-        exports.REQ_MYSQL_TRANSACTION.listener = async (data) => {
-            if (!this.pool)
-                return { error: { code: "NO_POOL", errno: 100000, fatal: true, sql: "", name: "NO_POOL", message: "Mysql pool not created" }, data: null };
-            const conn = await this.pool.getConnection();
-            (0, LogService_1.logCrit)("${MysqlService.js}", "REQ_MYSQL_TRANSACTION deprecated, use REQ_MYSQL_TBEGIN, REQ_MYSQL_TQUERY, REQ_MYSQL_TCOMMIT, REQ_MYSQL_TROLLBACK");
-            if (!conn)
-                return { error: { code: "NO_CONN", errno: 100001, fatal: true, sql: "", name: "NO_CONN", message: "Mysql pool cant get connection" }, data: null };
-            const trx = {
-                id: MysqlService.nextTransactionID++,
-                timestamp: Date.now(),
-                conn: conn,
-                queries: []
-            };
-            let income = [];
-            try {
-                await conn.query("START TRANSACTION");
-            }
-            catch (e) {
-                const err = this.createMysqlQueryError(e);
-                this.storeTransactionAsProblem(trx, err.message);
-                return { error: err, data: null };
-            }
-            for (let i of data) {
-                const query = MysqlService.prepareQuery(i.query, i.fields);
-                let err = null;
-                try {
-                    const d = await conn.query(query);
-                    income.push(d[0]);
-                }
-                catch (e) {
-                    err = this.createMysqlQueryError(e);
-                }
-                trx.queries.push({
-                    sql: query,
-                    status: err ? err.message : "completed"
-                });
-                if (err) {
-                    this.storeTransactionAsProblem(trx, err.message);
-                    return { error: err, data: null };
-                }
-            }
-            const err = await this.commit(trx);
-            return { error: err, data: income };
-        };
     }
     async commit(trx) {
         try {
@@ -443,7 +398,8 @@ class MysqlService extends BaseService_1.BaseService {
                         system: i.system,
                         ignoreInInsert: i.ignoreInInsert,
                         ignoreInUpdate: i.ignoreInUpdate,
-                        useInReplace: i.useInReplace
+                        useInReplace: i.useInReplace,
+                        name: i.name
                     };
                 }
                 else
@@ -470,7 +426,7 @@ class MysqlService extends BaseService_1.BaseService {
                     };
                 }
                 fields.push({
-                    name: i,
+                    name: mo.name ?? i,
                     value: mo.value,
                     system: mo.system,
                     ignoreInInsert: mo.system,
@@ -683,16 +639,17 @@ class MysqlService extends BaseService_1.BaseService {
         });
     }
     async queryAsync(conn, query) {
+        let result = null;
         try {
-            const result = await conn.query(query);
-            return {
-                err: null,
-                results: result[0],
-            };
+            result = await conn.query(query);
         }
         catch (e) {
             return { err: this.createMysqlQueryError(e) };
         }
+        return {
+            err: null,
+            results: result[0],
+        };
     }
     createMysqlQueryError(err) {
         if (err && typeof err === "object" && "code" in err && "errno" in err && "sql" in err && "name" in err && "message" in err) {

package/package.json

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