badmfck-api-server 3.9.7 → 3.9.81

package/dist/apiServer/APIService.js

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

package/dist/apiServer/helper/UID.js

@@ -14,8 +14,8 @@ class UID {
             + ""
             + Math.round(Math.random() * 1000)).toString(16), 'hex').toString('base64');
         uid = uid.replaceAll("=", "");
-        uid = uid.replaceAll("+", ".");
-        uid = uid.replaceAll("/", "_");
+        uid = uid.replaceAll("+", "pL");
+        uid = uid.replaceAll("/", "sl");
         return uid;
     }
     static generateRandomNumberBase(count) {

package/dist/apiServer/helper/Validator.js

@@ -282,7 +282,7 @@ class Validator {
                 this.filterStructure(structure[0], i);
             return;
         }
-        for (let key in object) {
+        for (let key of Object.keys(object)) {
             if (!(key in structure)) {
                 delete object[key];
                 continue;
@@ -314,72 +314,71 @@ class Validator {
                 const items = numericKeys.length > 0
                     ? numericKeys.map((i) => node[String(i)])
                     : Object.values(node);
-                node = items.map((it) => this.syncStructure(tmpl, it));
-                return node;
+                return items.map((it) => this.syncStructure(tmpl, it));
             }
             if (!Array.isArray(node))
                 return node;
-            if (tmpl !== undefined) {
-                for (let i = 0; i < node.length; i++) {
-                    const item = node[i];
-                    if (item === null || item === undefined) {
-                        node[i] = this.clone(tmpl);
-                        node[i] = this.syncStructure(tmpl, node[i]);
-                        continue;
-                    }
-                    if (this.isPlainObject(tmpl) && this.isPlainObject(item)) {
-                        node[i] = this.syncStructure(tmpl, item);
-                        continue;
-                    }
-                    if (Array.isArray(tmpl) && Array.isArray(item)) {
-                        node[i] = this.syncStructure(tmpl, item);
-                        continue;
-                    }
-                    node[i] = this.clone(tmpl);
-                    node[i] = this.syncStructure(tmpl, node[i]);
+            if (tmpl === undefined)
+                return node;
+            const out = new Array(node.length);
+            for (let i = 0; i < node.length; i++) {
+                const item = node[i];
+                if (item === null || item === undefined) {
+                    out[i] = this.syncStructure(tmpl, this.clone(tmpl));
+                }
+                else if (this.isPlainObject(tmpl) && this.isPlainObject(item)) {
+                    out[i] = this.syncStructure(tmpl, item);
+                }
+                else if (Array.isArray(tmpl) && Array.isArray(item)) {
+                    out[i] = this.syncStructure(tmpl, item);
+                }
+                else {
+                    out[i] = this.syncStructure(tmpl, this.clone(tmpl));
                 }
             }
-            return node;
-        }
-        if (!this.isPlainObject(node))
-            return node;
-        for (const k of Object.keys(node)) {
-            if (!(k in structure))
-                delete node[k];
+            return out;
         }
+        const out = {};
+        const src = this.isPlainObject(node) ? node : {};
         for (const k of Object.keys(structure)) {
             const sv = structure[k];
             if (k.startsWith("$__")) {
-                node[k] = this.clone(sv);
+                out[k] = this.clone(sv);
                 continue;
             }
-            const has = Object.prototype.hasOwnProperty.call(node, k);
-            const ov = has ? node[k] : undefined;
+            const has = Object.prototype.hasOwnProperty.call(src, k);
+            const ov = has ? src[k] : undefined;
+            const { optional, skip_validation, default: def } = this.parseStructureOptions(k, structure);
             if (!has) {
-                node[k] = this.clone(sv);
-                if (sv && typeof sv === "object")
-                    node[k] = this.syncStructure(sv, node[k]);
+                if (sv && typeof sv === "object") {
+                    out[k] = this.syncStructure(sv, this.clone(sv));
+                }
+                else {
+                    out[k] = this.clone(sv);
+                }
                 continue;
             }
-            const { optional, default: def } = this.parseStructureOptions(k, structure);
             if (ov === null || ov === undefined) {
                 if (def !== undefined && !optional) {
-                    node[k] = this.clone(def);
-                    continue;
+                    out[k] = this.clone(def);
                 }
-                if (!optional) {
-                    node[k] = this.clone(sv);
-                    if (sv && typeof sv === "object")
-                        node[k] = this.syncStructure(sv, node[k]);
-                    continue;
+                else if (!optional || skip_validation) {
+                    out[k] = sv && typeof sv === "object"
+                        ? this.syncStructure(sv, this.clone(sv))
+                        : this.clone(sv);
                 }
+                else {
+                    out[k] = ov;
+                }
+                continue;
             }
             if (sv && typeof sv === "object") {
-                node[k] = this.syncStructure(sv, ov);
+                out[k] = this.syncStructure(sv, ov);
                 continue;
             }
+            out[k] = ov;
         }
-        return node;
+        return out;
     }
     static convertToType(value, type) {
         if (value === null || value === undefined)

package/package.json

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