badmfck-api-server 4.1.5 → 4.1.7

package/dist/apiServer/APIService.js

@@ -39,6 +39,7 @@ const express_fileupload_1 = __importDefault(require("express-fileupload"));
 const Liveness_1 = require("./routes/Liveness");
 const Readiness_1 = require("./routes/Readiness");
 const http_1 = __importDefault(require("http"));
+const path_1 = __importDefault(require("path"));
 const StatService_1 = require("./StatService");
 const ExternalServiceEndpoint_1 = require("./external/ExternalServiceEndpoint");
 const MonitorService_1 = require("./MonitorService");
@@ -97,7 +98,7 @@ async function Initializer(services) {
 }
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
-    version = "4.1.05";
+    version = "4.1.07";
     options;
     monitor = null;
     started = new Date();
@@ -485,26 +486,35 @@ class APIService extends BaseService_1.BaseService {
         else {
             try {
                 if (data.file) {
-                    res.sendFile(data.file, err => {
-                        if (err) {
-                            (0, LogService_1.logError)("Can't send file: " + data.file);
-                            if (!res.headersSent && !res.writableEnded) {
-                                res.status(500).send({ error: DefaultErrors_1.default.CANT_SEND_FILE, data: null });
-                                return;
-                            }
-                            else {
-                                try {
-                                    res.destroy?.(err);
-                                }
-                                catch { }
-                                return;
-                            }
+                    const filePath = path_1.default.isAbsolute(data.file) ? data.file : path_1.default.resolve(data.file);
+                    const onSendFileError = (err) => {
+                        (0, LogService_1.logError)("Can't send file: " + filePath);
+                        if (!res.headersSent && !res.writableEnded) {
+                            res.status(500).send({ error: DefaultErrors_1.default.CANT_SEND_FILE, data: null });
+                            return;
                         }
                         else {
-                            if (req && !data.ignoreHttpLogging)
-                                this.addNetlog(data, req, requestTime, 0);
+                            try {
+                                res.destroy?.(err);
+                            }
+                            catch { }
+                            return;
                         }
-                    });
+                    };
+                    try {
+                        res.sendFile(filePath, err => {
+                            if (err) {
+                                onSendFileError(err);
+                            }
+                            else {
+                                if (req && !data.ignoreHttpLogging)
+                                    this.addNetlog(data, req, requestTime, 0);
+                            }
+                        });
+                    }
+                    catch (e) {
+                        onSendFileError(e);
+                    }
                     return;
                 }
                 if (data.redirect) {

package/dist/apiServer/DBService.d.ts

@@ -3,7 +3,7 @@ import { BaseService } from "./BaseService";
 import { IDBAdapter } from "./db/IDBAdapter";
 export interface IDBQueryField {
     name?: string | null;
-    value: string | number | boolean | null | undefined;
+    value: string | number | boolean | Date | null | undefined;
     system?: boolean;
     ignoreInInsert?: boolean;
     ignoreInUpdate?: boolean;

package/dist/apiServer/DBService.js

@@ -151,7 +151,7 @@ class DBService extends BaseService_1.BaseService {
         };
         exports.REQ_DB.listener = async (req) => {
             if (req.fields)
-                req.fields = JSON.parse(JSON.stringify(req.fields));
+                req.fields = structuredClone(req.fields);
             const executionStartTime = Date.now();
             if (!req.dbid && DBService.allInstances.length === 1 && DBService.allInstances[0].adapter) {
                 return await DBService.allInstances[0].adapter.query(req);

package/dist/apiServer/db/MysqlAdapter.js

@@ -586,6 +586,8 @@ class MysqlAdapter {
                     queryField = { value: null, system: true };
                 if (typeof queryField === "string" || typeof queryField === "number" || typeof queryField === "boolean")
                     queryField = { value: queryField, system: false };
+                if (queryField instanceof Date)
+                    queryField = { value: queryField, system: false };
                 if (queryField === null)
                     queryField = { value: null, system: true };
                 if (queryField.value === undefined) {
@@ -669,24 +671,26 @@ class MysqlAdapter {
             field.__parsedValue = "NULL";
             return "NULL";
         }
-        if (!system && typeof value === "object") {
-            try {
-                value = JSON.stringify(value);
-            }
-            catch (e) {
-                console.error("Can't prepare JSON object", e);
-                value = "{}";
-            }
-        }
-        if (!system && typeof value === "string") {
-            value = promise_1.default.escape(value);
-        }
-        if (typeof value === "boolean")
-            value = value ? 1 : 0;
-        if (typeof value === "object" && value instanceof Date) {
+        if (value instanceof Date) {
             const utcString = value.toISOString().slice(0, 19).replace('T', ' ');
             value = promise_1.default.escape(utcString);
         }
+        else {
+            if (!system && typeof value === "object") {
+                try {
+                    value = JSON.stringify(value);
+                }
+                catch (e) {
+                    console.error("Can't prepare JSON object", e);
+                    value = "{}";
+                }
+            }
+            if (!system && typeof value === "string") {
+                value = promise_1.default.escape(value);
+            }
+            if (typeof value === "boolean")
+                value = value ? 1 : 0;
+        }
         if (field.fields && typeof field.fields === "object" && value && typeof value === "string" && value.indexOf("@") !== -1) {
             for (let key in field.fields) {
                 if (!field.fields[key])

package/package.json

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