badmfck-api-server 4.0.95 → 4.0.97

package/dist/apiServer/APIService.js

@@ -97,7 +97,7 @@ async function Initializer(services) {
 }
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
-    version = "4.0.95";
+    version = "4.0.97";
     options;
     monitor = null;
     started = new Date();

package/dist/apiServer/DBService.js

@@ -284,7 +284,7 @@ class DBService extends BaseService_1.BaseService {
         return error;
     }
     async reportQuery(result, req) {
-        const hour = (new Date().getHours() + 1).toString().padStart(2, "0");
+        const hour = new Date().getHours().toString().padStart(2, "0");
         if (this.queriesStat.hour !== hour) {
             this.queriesStat.hour = hour;
             this.queriesStat.stat = { failed: 0, success: 0, failedQueries: [] };
@@ -297,15 +297,14 @@ class DBService extends BaseService_1.BaseService {
             this.queriesStat.stat.success++;
         const execTime = result.execution.finished_at - result.execution.started_at;
         if (execTime && execTime > 0) {
-            for (let i of this.longQueries) {
-                if (execTime > i.execution) {
-                    this.longQueries.push({
-                        execution: execTime,
-                        query: req.query,
-                        started_at: result.execution.started_at,
-                        finished_at: result.execution.finished_at
-                    });
-                }
+            const minLong = this.longQueries.length < 20 || execTime > this.longQueries[0].execution;
+            if (minLong) {
+                this.longQueries.push({
+                    execution: execTime,
+                    query: req.query,
+                    started_at: result.execution.started_at,
+                    finished_at: result.execution.finished_at
+                });
             }
             this.longQueries.sort((a, b) => a.execution - b.execution);
             if (this.longQueries.length > 20)

package/dist/apiServer/external/MicroserviceClient.js

@@ -62,7 +62,7 @@ class MicroserviceClient extends BaseService_1.BaseService {
         const ts = Date.now().toString();
         const nonce = crypto_1.default.randomBytes(12).toString("hex");
         const maxAttempts = 10;
-        const attemptTimeout = 500;
+        const attemptTimeout = 1000;
         for (let attempt = 1; attempt <= maxAttempts; attempt++) {
             const rawSecret = Buffer.from(this.options.securityKey, "base64");
             const key = crypto_1.default.createHash("sha256").update(rawSecret).digest();
@@ -108,7 +108,10 @@ class MicroserviceClient extends BaseService_1.BaseService {
                 }
                 return { ...DefaultErrors_1.default.EXTERNAL_SERVICE_ERROR, details: "Microservice processing timeout, attempts: " + attempt };
             }
-            return (body && typeof body === "object" && "error" in body) ? body.error : (body.data ?? null);
+            if (body && typeof body === "object") {
+                return "error" in body ? body.error : (body.data ?? null);
+            }
+            return body ?? null;
         }
         return { ...DefaultErrors_1.default.EXTERNAL_SERVICE_ERROR, details: "Unknown polling error" };
     }

package/dist/apiServer/helper/DataProvider.js

@@ -21,8 +21,7 @@ class DataProvider {
             this.cacheTime = +cacheTime;
         if (isNaN(this.cacheTime))
             this.cacheTime = 0;
-        if (!this.name)
-            this.name = "DataProvider " + (DataProvider.nextID++);
+        this.name = name ?? "DataProvider " + (DataProvider.nextID++);
     }
     async forceUpdate() {
         if (this.busy)

package/dist/apiServer/helper/Validator.js

@@ -58,7 +58,7 @@ class Validator {
             s_options.min = undefined;
         if (s_options.max == undefined || isNaN(s_options.max)) {
             if (structure[key + "max"] && !isNaN(structure[key + "max"]))
-                s_options.min = parseInt(structure[key + "max"]);
+                s_options.max = parseInt(structure[key + "max"]);
         }
         if (s_options.max && isNaN(s_options.max))
             s_options.max = undefined;
@@ -143,6 +143,13 @@ class Validator {
                     }
                 }
             }
+            if (structureOptions.optional && typeof object[i] === "object" && object[i] !== null) {
+                const isEmpty = Array.isArray(object[i]) ? object[i].length === 0 : Object.keys(object[i]).length === 0;
+                if (isEmpty) {
+                    foundKeys.push(i);
+                    continue;
+                }
+            }
             if ((object[i] === null || object[i] === undefined)) {
                 if (structure[i] === null || structure[i] === undefined) {
                     foundKeys.push(i);
@@ -210,32 +217,43 @@ class Validator {
             if (structure['$__' + i + "_values"])
                 structureOptions.values = structure['$__' + i + "_values"];
             if (Array.isArray(structureOptions.values) && structureOptions.values.length) {
-                if (!structureOptions.values.includes(object[i])) {
-                    if (structureOptions.default && structureOptions.values.includes(structureOptions.default)) {
-                        object[i] = structureOptions.default;
-                        continue;
-                    }
+                const checkOneValue = (val) => {
+                    if (structureOptions.values.includes(val))
+                        return null;
                     let caseValue = null;
-                    for (let i of structureOptions.values) {
-                        if (i === null || i === undefined)
+                    for (const av of structureOptions.values) {
+                        if (av === null || av === undefined)
                             continue;
-                        const v = (i + "").toLowerCase().trim();
-                        if (v === (object[i] + "").toLowerCase().trim()) {
-                            caseValue = object[i];
+                        if ((av + "").toLowerCase().trim() === (val + "").toLowerCase().trim()) {
+                            caseValue = av;
                             break;
                         }
-                        const val = (object[i] + "").toLowerCase().trim();
-                        if (typeof i === "object") {
-                            const keys = Object.keys(i);
-                            for (const key of keys) {
-                                if ((i[key] + "").toLowerCase().trim() === val) {
-                                    caseValue = i[key];
+                        if (typeof av === "object") {
+                            for (const key of Object.keys(av)) {
+                                if ((av[key] + "").toLowerCase().trim() === (val + "").toLowerCase().trim()) {
+                                    caseValue = av[key];
                                     break;
                                 }
                             }
                         }
                     }
-                    errors.push("wrong value for field '" + parentPath + i + "'" + (caseValue ? ", check case for: " + caseValue : ""));
+                    return "wrong value for field '" + parentPath + i + "'" + (caseValue ? ", check case for: " + caseValue : "");
+                };
+                if (Array.isArray(object[i])) {
+                    for (const item of object[i]) {
+                        const err = checkOneValue(item);
+                        if (err)
+                            errors.push(err);
+                    }
+                }
+                else {
+                    if (structureOptions.default && structureOptions.values.includes(structureOptions.default)) {
+                        object[i] = structureOptions.default;
+                        continue;
+                    }
+                    const err = checkOneValue(object[i]);
+                    if (err)
+                        errors.push(err);
                 }
             }
             if (typeof structure[i] === "string" && structureOptions.regex) {
@@ -257,7 +275,7 @@ class Validator {
             }
             if (typeof structure[i] === "number") {
                 if (typeof object[i] === "string") {
-                    if (object[i].indexOf("."))
+                    if (object[i].indexOf(".") !== -1)
                         object[i] = parseFloat(object[i]);
                     else
                         object[i] = parseInt(object[i]);
@@ -477,7 +495,7 @@ class Validator {
             if (opt.max && value > opt.max)
                 return ValidationReport.VALUE_TOO_BIG;
             if (opt.min && value < opt.min)
-                return ValidationReport.VALUE_TOO_BIG;
+                return ValidationReport.VALUE_TOO_SHORT;
             return ValidationReport.OK;
         }
         if (typeof value !== "string")

package/package.json

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